Now using CurseModpackDownloader V1.x (with magic) (fix #26) and (Fin…

…ally) fixed #25
DoubleDoorDevelopment · Apr 28, 2017 · 5e29244 · 5e29244
1 parent bdfc430
commit 5e29244
Show file tree

Hide file tree

Showing 65 changed files with 188 additions and 247 deletions.
diff --git a/LICENSE-HEADER.txt b/LICENSE-HEADER.txt
@@ -1,5 +1,5 @@
 D3Backend
-Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+Copyright (C) 2015 - 2017  Dries007 & Double Door Development
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published
@@ -12,4 +12,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle b/build.gradle
@@ -25,19 +25,11 @@ def gitURL = "github.com/DoubleDoorDevelopment/D3Backend"
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-//noinspection GroovyAssignabilityCheck
 configurations {
     compile
     deployJars
 }
 
-repositories {
-    maven {
-         name "DDD repo"
-         url "http://doubledoordev.net/maven/"
-     }
-}
-
 idea {
     project {
         copyright {
@@ -59,14 +51,13 @@ idea {
 
 repositories {
     mavenCentral()
-//    maven {
-//	    name = 'sk89q'
-//        url = "http://maven.sk89q.com/repo/"
-//    }
 	maven {
         name = 'sonatype-nexus'
         url = 'https://oss.sonatype.org/content/groups/public/'
     }
+    flatDir {
+        dirs 'libs'
+    }
 }
 
 //noinspection GroovyAssignabilityCheck
@@ -78,11 +69,10 @@ dependencies {
     compile group: "org.freemarker", name: "freemarker", version: "2.3.20"
     compile group: "org.apache.logging.log4j", name: "log4j-core", version: "2.0.2"
     compile group: "net.lingala.zip4j", name: "zip4j", version: "1.3.2"
-    //compile group: "com.sk89q", name: "intake", version: "3.1.1-SNAPSHOT"
     compile group: "org.glassfish.grizzly", name: "grizzly-http-all", version: "2.3.17"
     compile group: "com.flowpowered", name: "flow-nbt", version: "1.0.0"
-    compile group: "net.doubledoordev.cmd", name: "CurseModpackDownloader", version: "0.+"
     compile group: "com.google.guava", name: "guava", version: "18.0"
+    compile group: "net.dries007.cmd", name: "CurseModpackDownloader", version: "1.+"
 }
 
 processResources {

diff --git a/libs/CurseModpackDownloader-1.0.3.SNAPSHOT-src.jar b/libs/CurseModpackDownloader-1.0.3.SNAPSHOT-src.jar
diff --git a/libs/CurseModpackDownloader-1.0.3.SNAPSHOT.jar b/libs/CurseModpackDownloader-1.0.3.SNAPSHOT.jar
diff --git a/src/main/java/net/doubledoordev/backend/Main.java b/src/main/java/net/doubledoordev/backend/Main.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -216,7 +216,7 @@ public static synchronized void shutdown()
         Settings.save();
         Cache.init();
         LOGGER.info("Attempting graceful shutdown of all servers...");
-        for (final Server server : Settings.SETTINGS.servers.values())
+        for (final Server server : SETTINGS.servers.values())
         {
             if (server.getOnline())
             {

diff --git a/src/main/java/net/doubledoordev/backend/TestMain.java b/src/main/java/net/doubledoordev/backend/TestMain.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/commands/Bindings.java b/src/main/java/net/doubledoordev/backend/commands/Bindings.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/commands/CommandHandler.java b/src/main/java/net/doubledoordev/backend/commands/CommandHandler.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/commands/CommandNotFoundException.java b/src/main/java/net/doubledoordev/backend/commands/CommandNotFoundException.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/permissions/Group.java b/src/main/java/net/doubledoordev/backend/permissions/Group.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/permissions/User.java b/src/main/java/net/doubledoordev/backend/permissions/User.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/server/BackupTask.java b/src/main/java/net/doubledoordev/backend/server/BackupTask.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/server/Dimension.java b/src/main/java/net/doubledoordev/backend/server/Dimension.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/server/FileManager.java b/src/main/java/net/doubledoordev/backend/server/FileManager.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -29,7 +29,6 @@
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.glassfish.grizzly.http.util.MimeType;
 
 import java.io.File;

diff --git a/src/main/java/net/doubledoordev/backend/server/JvmData.java b/src/main/java/net/doubledoordev/backend/server/JvmData.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published

diff --git a/src/main/java/net/doubledoordev/backend/server/OutWrapper.java b/src/main/java/net/doubledoordev/backend/server/OutWrapper.java
diff --git a/src/main/java/net/doubledoordev/backend/server/RestartingInfo.java b/src/main/java/net/doubledoordev/backend/server/RestartingInfo.java
@@ -1,6 +1,6 @@
 /*
  * D3Backend
- * Copyright (C) 2015 - 2016  Dries007 & Double Door Development
+ * Copyright (C) 2015 - 2017  Dries007 & Double Door Development
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published