Update to fix some longstanding issues, such as the restart timers. +…

… Copyright update
DoubleDoorDevelopment · Mar 9, 2016 · 48ee01f · 48ee01f
1 parent abe01b7
commit 48ee01f
Show file tree

Hide file tree

Showing 75 changed files with 851 additions and 758 deletions.
diff --git a/LICENSE-HEADER.txt b/LICENSE-HEADER.txt
@@ -1,15 +1,15 @@
-    D3Backend
-    Copyright (C) 2015  Dries007 & Double Door Development
+D3Backend
+Copyright (C) 2015 - 2016  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
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+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
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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/>.
+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/>.
diff --git a/src/main/java/com/sk89q/intake/context/CommandContext.java b/src/main/java/com/sk89q/intake/context/CommandContext.java
@@ -21,13 +21,7 @@
 
 import com.sk89q.intake.CommandException;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class CommandContext {
 

diff --git a/src/main/java/com/sk89q/intake/dispatcher/Dispatcher.java b/src/main/java/com/sk89q/intake/dispatcher/Dispatcher.java
@@ -22,7 +22,6 @@
 import com.sk89q.intake.CommandCallable;
 import com.sk89q.intake.CommandMapping;
 
-
 import java.util.Collection;
 import java.util.Set;
 

diff --git a/src/main/java/com/sk89q/intake/dispatcher/SimpleDispatcher.java b/src/main/java/com/sk89q/intake/dispatcher/SimpleDispatcher.java
@@ -20,26 +20,12 @@
 package com.sk89q.intake.dispatcher;
 
 import com.google.common.base.Joiner;
-import com.sk89q.intake.CommandCallable;
-import com.sk89q.intake.CommandException;
-import com.sk89q.intake.CommandMapping;
-import com.sk89q.intake.ImmutableCommandMapping;
-import com.sk89q.intake.InvalidUsageException;
-import com.sk89q.intake.InvocationCommandException;
-import com.sk89q.intake.SettableDescription;
-import com.sk89q.intake.SettableParameter;
+import com.sk89q.intake.*;
 import com.sk89q.intake.context.CommandContext;
 import com.sk89q.intake.context.CommandLocals;
 import com.sk89q.intake.util.auth.AuthorizationException;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * A simple implementation of {@link Dispatcher}.

diff --git a/src/main/java/com/sk89q/intake/parametric/ParametricBuilder.java b/src/main/java/com/sk89q/intake/parametric/ParametricBuilder.java
@@ -40,7 +40,6 @@
 import com.sk89q.intake.util.auth.Authorizer;
 import com.sk89q.intake.util.auth.NullAuthorizer;
 
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.ArrayList;

diff --git a/src/main/java/com/sk89q/intake/parametric/argument/ContextArgumentStack.java b/src/main/java/com/sk89q/intake/parametric/argument/ContextArgumentStack.java
@@ -19,8 +19,8 @@
 
 package com.sk89q.intake.parametric.argument;
 
-import com.sk89q.intake.parametric.MissingParameterException;
 import com.sk89q.intake.context.CommandContext;
+import com.sk89q.intake.parametric.MissingParameterException;
 import com.sk89q.intake.parametric.ParameterException;
 import com.sk89q.intake.parametric.ParametricBuilder;
 

diff --git a/src/main/java/com/sk89q/intake/parametric/argument/StringArgumentStack.java b/src/main/java/com/sk89q/intake/parametric/argument/StringArgumentStack.java
@@ -19,8 +19,8 @@
 
 package com.sk89q.intake.parametric.argument;
 
-import com.sk89q.intake.parametric.MissingParameterException;
 import com.sk89q.intake.context.CommandContext;
+import com.sk89q.intake.parametric.MissingParameterException;
 import com.sk89q.intake.parametric.ParameterException;
 import com.sk89q.intake.util.StringUtils;
 

diff --git a/src/main/java/com/sk89q/intake/parametric/binding/Binding.java b/src/main/java/com/sk89q/intake/parametric/binding/Binding.java
@@ -20,10 +20,10 @@
 package com.sk89q.intake.parametric.binding;
 
 import com.sk89q.intake.CommandException;
-import com.sk89q.intake.parametric.argument.ArgumentStack;
 import com.sk89q.intake.parametric.ParameterData;
 import com.sk89q.intake.parametric.ParameterException;
 import com.sk89q.intake.parametric.ParametricBuilder;
+import com.sk89q.intake.parametric.argument.ArgumentStack;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;

diff --git a/src/main/java/com/sk89q/intake/parametric/binding/BindingHelper.java b/src/main/java/com/sk89q/intake/parametric/binding/BindingHelper.java
@@ -20,11 +20,11 @@
 package com.sk89q.intake.parametric.binding;
 
 import com.sk89q.intake.CommandException;
-import com.sk89q.intake.parametric.argument.ArgumentStack;
-import com.sk89q.intake.parametric.handler.ExceptionConverter;
 import com.sk89q.intake.parametric.ParameterData;
 import com.sk89q.intake.parametric.ParameterException;
 import com.sk89q.intake.parametric.ParametricBuilder;
+import com.sk89q.intake.parametric.argument.ArgumentStack;
+import com.sk89q.intake.parametric.handler.ExceptionConverter;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;

diff --git a/src/main/java/com/sk89q/intake/parametric/binding/BindingMatch.java b/src/main/java/com/sk89q/intake/parametric/binding/BindingMatch.java
@@ -19,11 +19,7 @@
 
 package com.sk89q.intake.parametric.binding;
 
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Denotes a match of a binding.

diff --git a/src/main/java/com/sk89q/intake/parametric/binding/PrimitiveBindings.java b/src/main/java/com/sk89q/intake/parametric/binding/PrimitiveBindings.java
@@ -25,7 +25,6 @@
 import com.sk89q.intake.parametric.annotation.Validate;
 import com.sk89q.intake.parametric.argument.ArgumentStack;
 
-
 import java.lang.annotation.Annotation;
 
 /**

diff --git a/src/main/java/com/sk89q/intake/parametric/handler/LegacyCommandsHandler.java b/src/main/java/com/sk89q/intake/parametric/handler/LegacyCommandsHandler.java
@@ -22,12 +22,12 @@
 import com.sk89q.intake.Command;
 import com.sk89q.intake.CommandException;
 import com.sk89q.intake.SettableDescription;
+import com.sk89q.intake.context.CommandContext;
 import com.sk89q.intake.context.CommandLocals;
 import com.sk89q.intake.parametric.MissingParameterException;
-import com.sk89q.intake.parametric.UnconsumedParameterException;
-import com.sk89q.intake.context.CommandContext;
 import com.sk89q.intake.parametric.ParameterData;
 import com.sk89q.intake.parametric.ParameterException;
+import com.sk89q.intake.parametric.UnconsumedParameterException;
 import com.sk89q.intake.parametric.binding.BindingBehavior;
 
 import java.lang.reflect.Method;

diff --git a/src/main/java/com/sk89q/intake/util/PrimaryAliasComparator.java b/src/main/java/com/sk89q/intake/util/PrimaryAliasComparator.java
@@ -21,7 +21,6 @@
 
 import com.sk89q.intake.CommandMapping;
 
-
 import java.util.Comparator;
 import java.util.regex.Pattern;
 

diff --git a/src/main/java/net/doubledoordev/backend/Main.java b/src/main/java/net/doubledoordev/backend/Main.java
@@ -1,19 +1,19 @@
 /*
- *     D3Backend
- *     Copyright (C) 2015  Dries007 & Double Door Development
+ * D3Backend
+ * Copyright (C) 2015 - 2016  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
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * 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
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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/>.
+ * 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/>.
  */
 
 package net.doubledoordev.backend;
@@ -114,7 +114,7 @@ public static void main(String[] args) throws Exception
         }
 
         // todo: get JDK and classload tools.jar + native library; if not jdk: disable warmroast
-        LOGGER.info("\n\n    D3Backend  Copyright (C) 2015  Dries007 & Double Door Development\n" +
+        LOGGER.info("\n\n    D3Backend  Copyright (C) 2015 - 2016  Dries007 & Double Door Development\n" +
                 "    This program comes with ABSOLUTELY NO WARRANTY;\n" +
                 "    This is free software, and you are welcome to redistribute it under certain conditions;\n" +
                 "    Type `license' for details.\n\n");

diff --git a/src/main/java/net/doubledoordev/backend/TestMain.java b/src/main/java/net/doubledoordev/backend/TestMain.java
@@ -0,0 +1,41 @@
+/*
+ * D3Backend
+ * Copyright (C) 2015 - 2016  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
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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/>.
+ */
+
+package net.doubledoordev.backend;
+
+import net.doubledoordev.backend.server.query.MCQuery;
+import net.doubledoordev.backend.server.query.QueryResponse;
+
+public class TestMain
+{
+    public static void main(String[] args) throws Exception
+    {
+        MCQuery query = new MCQuery("vps2.dries007.net", 25505);
+        QueryResponse queryResponse;
+        while (true)
+        {
+            queryResponse = query.fullStat();
+            if (queryResponse != null) System.out.println(queryResponse.toString());
+            else System.out.println("null");
+            synchronized (Thread.currentThread())
+            {
+                Thread.currentThread().wait(100);
+            }
+        }
+    }
+}
diff --git a/src/main/java/net/doubledoordev/backend/commands/Bindings.java b/src/main/java/net/doubledoordev/backend/commands/Bindings.java
@@ -1,19 +1,19 @@
 /*
- *     D3Backend
- *     Copyright (C) 2015  Dries007 & Double Door Development
+ * D3Backend
+ * Copyright (C) 2015 - 2016  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
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * 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
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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/>.
+ * 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/>.
  */
 
 package net.doubledoordev.backend.commands;

diff --git a/src/main/java/net/doubledoordev/backend/commands/CommandHandler.java b/src/main/java/net/doubledoordev/backend/commands/CommandHandler.java
@@ -1,19 +1,19 @@
 /*
- *     D3Backend
- *     Copyright (C) 2015  Dries007 & Double Door Development
+ * D3Backend
+ * Copyright (C) 2015 - 2016  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
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * 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
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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/>.
+ * 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/>.
  */
 
 package net.doubledoordev.backend.commands;
@@ -286,7 +286,7 @@ public void license()
     {
         CMDLOGGER.info(
                 "    D3Backend\n" +
-                        "    Copyright (C) 2015  Dries007 & Double Door Development\n" +
+                        "    Copyright (C) 2015 - 2016 Dries007 & Double Door Development\n" +
                         "\n" +
                         "    This program is free software: you can redistribute it and/or modify\n" +
                         "    it under the terms of the GNU Affero General Public License as published\n" +

diff --git a/src/main/java/net/doubledoordev/backend/commands/CommandNotFoundException.java b/src/main/java/net/doubledoordev/backend/commands/CommandNotFoundException.java
@@ -1,19 +1,19 @@
 /*
- *     D3Backend
- *     Copyright (C) 2015  Dries007 & Double Door Development
+ * D3Backend
+ * Copyright (C) 2015 - 2016  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
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * 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
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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/>.
+ * 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/>.
  */
 
 package net.doubledoordev.backend.commands;

diff --git a/src/main/java/net/doubledoordev/backend/permissions/Group.java b/src/main/java/net/doubledoordev/backend/permissions/Group.java
@@ -1,19 +1,19 @@
 /*
- *     D3Backend
- *     Copyright (C) 2015  Dries007 & Double Door Development
+ * D3Backend
+ * Copyright (C) 2015 - 2016  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
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * 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
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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/>.
+ * 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/>.
  */
 
 package net.doubledoordev.backend.permissions;