diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index c2dfd90317..9537c1fc87 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -22,6 +22,7 @@ import mindustry.input.*;
 import mindustry.maps.*;
 import mindustry.mod.*;
 import mindustry.net.Net;
+import mindustry.type.Weather.*;
 import mindustry.world.blocks.defense.ForceProjector.*;
 
 import java.nio.charset.*;
diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java
index db49abaa7a..92208e67cf 100644
--- a/core/src/mindustry/content/Planets.java
+++ b/core/src/mindustry/content/Planets.java
@@ -1,6 +1,6 @@
 package mindustry.content;
 
-import io.anuke.mindustry.ctype.*;
+import mindustry.ctype.*;
 import mindustry.type.*;
 
 public class Planets implements ContentList{
diff --git a/core/src/mindustry/maps/filters/CoreSpawnFilter.java b/core/src/mindustry/maps/filters/CoreSpawnFilter.java
index ad73d7686f..3901288f92 100644
--- a/core/src/mindustry/maps/filters/CoreSpawnFilter.java
+++ b/core/src/mindustry/maps/filters/CoreSpawnFilter.java
@@ -1,12 +1,12 @@
 package mindustry.maps.filters;
 
-import io.anuke.arc.collection.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.maps.filters.FilterOption.*;
-import io.anuke.mindustry.world.blocks.storage.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 /** Selects X spawns from the core spawn pool.*/
 public class CoreSpawnFilter extends GenerateFilter{
diff --git a/core/src/mindustry/maps/filters/EnemySpawnFilter.java b/core/src/mindustry/maps/filters/EnemySpawnFilter.java
index bb2993dc1c..53f97e488c 100644
--- a/core/src/mindustry/maps/filters/EnemySpawnFilter.java
+++ b/core/src/mindustry/maps/filters/EnemySpawnFilter.java
@@ -1,8 +1,9 @@
 package mindustry.maps.filters;
 
-import io.anuke.arc.collection.*;
-import io.anuke.arc.util.*;
-import io.anuke.mindustry.maps.filters.FilterOption.*;
+import arc.struct.*;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.maps.filters.FilterOption.*;
 import mindustry.world.*;
 
 /** Selects X spawns from the spawn pool.*/
diff --git a/core/src/mindustry/maps/generators/RandomGenerator.java b/core/src/mindustry/maps/generators/RandomGenerator.java
index 924c373be2..6f7f9ae143 100644
--- a/core/src/mindustry/maps/generators/RandomGenerator.java
+++ b/core/src/mindustry/maps/generators/RandomGenerator.java
@@ -1,10 +1,9 @@
 package mindustry.maps.generators;
 
-import arc.struct.StringMap;
-import mindustry.content.Blocks;
-import mindustry.maps.Map;
-import mindustry.world.Block;
-import mindustry.world.Tile;
+import arc.struct.*;
+import mindustry.content.*;
+import mindustry.maps.*;
+import mindustry.world.*;
 
 import static mindustry.Vars.world;
 
diff --git a/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java b/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java
index e618a7faf1..d62eeaf076 100644
--- a/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java
+++ b/core/src/mindustry/maps/zonegen/OvergrowthGenerator.java
@@ -1,9 +1,9 @@
 package mindustry.maps.zonegen;
 
-import arc.math.Mathf;
-import mindustry.content.Blocks;
-import mindustry.maps.generators.BasicGenerator;
-import mindustry.world.Tile;
+import arc.math.*;
+import mindustry.content.*;
+import mindustry.maps.generators.*;
+import mindustry.world.*;
 
 import static mindustry.Vars.schematics;
 
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index ec6e0645a3..a056fa4e83 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -1,7 +1,7 @@
 package mindustry.type;
 
-import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.mindustry.ctype.*;
+import arc.scene.ui.layout.*;
+import mindustry.ctype.*;
 
 //TODO add full icon for this planet
 public class Planet extends UnlockableContent{
diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java
index e9abb87472..b83be04262 100644
--- a/core/src/mindustry/type/Weather.java
+++ b/core/src/mindustry/type/Weather.java
@@ -1,16 +1,16 @@
 package mindustry.type;
 
-import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.util.ArcAnnotate.*;
-import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.*;
+import arc.util.ArcAnnotate.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.ctype.*;
+import mindustry.entities.*;
+import mindustry.entities.traits.*;
+import mindustry.entities.type.*;
 import mindustry.type.Weather.*;
 
 import java.io.*;
 
-import static io.anuke.mindustry.Vars.*;
+import static mindustry.Vars.*;
 
 public abstract class Weather<T extends WeatherEntity> extends MappableContent{
     protected float duration = 100f;
@@ -34,7 +34,8 @@ public abstract class Weather<T extends WeatherEntity> extends MappableContent{
         /** How long this event has been occuring in ticks. */
         protected float life;
         /** Type of weather that is being simulated. */
-        protected @NonNull Weather weather;
+        protected @NonNull
+        Weather weather;
 
         public WeatherEntity(Weather weather){
             this.weather = weather;