From 9ddd76d6cbd1b8b2bd743c9dd167972218e3dfcf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 1 Mar 2020 15:41:10 -0500
Subject: [PATCH] Cleanup

---
 core/src/mindustry/core/World.java             |  1 -
 core/src/mindustry/mod/Mods.java               |  1 -
 core/src/mindustry/{plugin => mod}/Plugin.java |  4 +---
 core/src/mindustry/type/Planet.java            |  2 ++
 core/src/mindustry/type/Satellite.java         | 12 ++++++++++++
 gradle.properties                              |  2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)
 rename core/src/mindustry/{plugin => mod}/Plugin.java (67%)
 create mode 100644 core/src/mindustry/type/Satellite.java

diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java
index e1e3d64196..306b19002b 100644
--- a/core/src/mindustry/core/World.java
+++ b/core/src/mindustry/core/World.java
@@ -343,7 +343,6 @@ public class World{
             dark = Math.max((edgeBlend - edgeDst) * (4f / edgeBlend), dark);
         }
 
-        //TODO tweak noise and radius
         if(state.hasSector()){
             int circleBlend = 14;
             //quantized angle
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 7adb1493af..214affe0a4 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -21,7 +21,6 @@ import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.MultiPacker.*;
-import mindustry.plugin.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 
diff --git a/core/src/mindustry/plugin/Plugin.java b/core/src/mindustry/mod/Plugin.java
similarity index 67%
rename from core/src/mindustry/plugin/Plugin.java
rename to core/src/mindustry/mod/Plugin.java
index 1f0ab0170c..5fbdfbf606 100644
--- a/core/src/mindustry/plugin/Plugin.java
+++ b/core/src/mindustry/mod/Plugin.java
@@ -1,6 +1,4 @@
-package mindustry.plugin;
-
-import mindustry.mod.*;
+package mindustry.mod;
 
 /** Defines a special type of mod that is always hidden. */
 public abstract class Plugin extends Mod{
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index 6b2783e5ce..d12937a278 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -55,6 +55,8 @@ public class Planet extends UnlockableContent{
     public @NonNull Planet solarSystem;
     /** All planets orbiting this one, in ascending order of radius. */
     public Array<Planet> children = new Array<>();
+    /** Sattelites orbiting this planet. */
+    public Array<Satellite> satellites = new Array<>();
     /** Loads the mesh. Clientside only. Defaults to a boring sphere mesh. */
     protected Prov<PlanetMesh> meshLoader = () -> new SunMesh(this, 2);
 
diff --git a/core/src/mindustry/type/Satellite.java b/core/src/mindustry/type/Satellite.java
new file mode 100644
index 0000000000..4b2546c651
--- /dev/null
+++ b/core/src/mindustry/type/Satellite.java
@@ -0,0 +1,12 @@
+package mindustry.type;
+
+import arc.util.ArcAnnotate.*;
+
+/** Any object that is orbiting a planet. */
+public class Satellite{
+    public @NonNull Planet planet;
+
+    public Satellite(@NonNull Planet orbiting){
+        this.planet = orbiting;
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index 3890e6056f..99b67b3a16 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=66e5566de0832e721ea552ccd31f0febfb6233d7
+archash=e925e63ed9201fd2f20a06cc6736f07c936f6882