Better organization

core/src/io/anuke/mindustry/ClientLauncher.java

@@ -11,7 +11,7 @@ import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.async.*;
 import io.anuke.mindustry.core.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.ctype.Content;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;

core/src/io/anuke/mindustry/Vars.java

@@ -10,6 +10,7 @@ import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.ai.*;
 import io.anuke.mindustry.core.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.traits.*;

core/src/io/anuke/mindustry/content/Blocks.java

@@ -7,10 +7,10 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;

core/src/io/anuke/mindustry/content/Bullets.java

@@ -4,11 +4,11 @@ import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.world.*;
 

core/src/io/anuke/mindustry/content/Fx.java

@@ -5,12 +5,13 @@ import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.entities.Effects.*;
 import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 
 import static io.anuke.mindustry.Vars.tilesize;
 

core/src/io/anuke/mindustry/content/Items.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.content;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemType;
 

core/src/io/anuke/mindustry/content/Liquids.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.content;
 
 import io.anuke.arc.graphics.Color;
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.type.Liquid;
 
 public class Liquids implements ContentList{

core/src/io/anuke/mindustry/content/Loadouts.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.content;
 
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.type.Loadout;
 
 public class Loadouts implements ContentList{

core/src/io/anuke/mindustry/content/Mechs.java

@@ -6,11 +6,11 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;

core/src/io/anuke/mindustry/content/StatusEffects.java

@@ -3,7 +3,7 @@ package io.anuke.mindustry.content;
 import io.anuke.arc.*;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.type.StatusEffect;
 

core/src/io/anuke/mindustry/content/TechTree.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.content;
 
 import io.anuke.arc.collection.Array;
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.Block;
 

core/src/io/anuke/mindustry/content/TypeIDs.java

@@ -3,8 +3,8 @@ package io.anuke.mindustry.content;
 import io.anuke.mindustry.entities.effect.Fire;
 import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.ctype.ContentList;
-import io.anuke.mindustry.game.TypeID;
+import io.anuke.mindustry.type.TypeID;
 
 public class TypeIDs implements ContentList{
     public static TypeID fire, puddle, player;

core/src/io/anuke/mindustry/content/UnitTypes.java

@@ -1,11 +1,11 @@
 package io.anuke.mindustry.content;
 
 import io.anuke.arc.collection.*;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.entities.type.base.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
 

core/src/io/anuke/mindustry/content/Zones.java

@@ -1,5 +1,6 @@
 package io.anuke.mindustry.content;
 
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.Objectives.*;
 import io.anuke.mindustry.maps.generators.*;

core/src/io/anuke/mindustry/core/ContentLoader.java

@@ -5,8 +5,8 @@ import io.anuke.arc.function.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.MappableContent;
 import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
 
@@ -20,11 +20,11 @@ import static io.anuke.mindustry.Vars.mods;
 @SuppressWarnings("unchecked")
 public class ContentLoader{
     private boolean loaded = false;
-    private ObjectMap<String, MappableContent>[] contentNameMap = new ObjectMap[ContentType.values().length];
+    private ObjectMap<String, io.anuke.mindustry.ctype.MappableContent>[] contentNameMap = new ObjectMap[ContentType.values().length];
-    private Array<Content>[] contentMap = new Array[ContentType.values().length];
+    private Array<io.anuke.mindustry.ctype.Content>[] contentMap = new Array[ContentType.values().length];
-    private MappableContent[][] temporaryMapper;
+    private io.anuke.mindustry.ctype.MappableContent[][] temporaryMapper;
-    private ObjectSet<Consumer<Content>> initialization = new ObjectSet<>();
+    private ObjectSet<Consumer<io.anuke.mindustry.ctype.Content>> initialization = new ObjectSet<>();
-    private ContentList[] content = {
+    private io.anuke.mindustry.ctype.ContentList[] content = {
         new Fx(),
         new Items(),
         new StatusEffects(),
@@ -62,7 +62,7 @@ public class ContentLoader{
             contentNameMap[type.ordinal()] = new ObjectMap<>();
         }
 
-        for(ContentList list : content){
+        for(io.anuke.mindustry.ctype.ContentList list : content){
             list.load();
         }
 
@@ -71,7 +71,7 @@ public class ContentLoader{
         }
 
         //check up ID mapping, make sure it's linear
-        for(Array<Content> arr : contentMap){
+        for(Array<io.anuke.mindustry.ctype.Content> arr : contentMap){
             for(int i = 0; i < arr.size; i++){
                 int id = arr.get(i).id;
                 if(id != i){
@@ -95,20 +95,20 @@ public class ContentLoader{
 
     /** Calls Content#init() on everything. Use only after all modules have been created.*/
     public void init(){
-        initialize(Content::init);
+        initialize(io.anuke.mindustry.ctype.Content::init);
     }
 
     /** Calls Content#load() on everything. Use only after all modules have been created on the client.*/
     public void load(){
-        initialize(Content::load);
+        initialize(io.anuke.mindustry.ctype.Content::load);
     }
 
     /** Initializes all content with the specified function. */
-    private void initialize(Consumer<Content> callable){
+    private void initialize(Consumer<io.anuke.mindustry.ctype.Content> callable){
         if(initialization.contains(callable)) return;
 
         for(ContentType type : ContentType.values()){
-            for(Content content : contentMap[type.ordinal()]){
+            for(io.anuke.mindustry.ctype.Content content : contentMap[type.ordinal()]){
                 try{
                     callable.accept(content);
                 }catch(Throwable e){
@@ -144,23 +144,23 @@ public class ContentLoader{
         //clear all content, currently not used
     }
 
-    public void handleContent(Content content){
+    public void handleContent(io.anuke.mindustry.ctype.Content content){
         contentMap[content.getContentType().ordinal()].add(content);
 
     }
 
-    public void handleMappableContent(MappableContent content){
+    public void handleMappableContent(io.anuke.mindustry.ctype.MappableContent content){
         if(contentNameMap[content.getContentType().ordinal()].containsKey(content.name)){
             throw new IllegalArgumentException("Two content objects cannot have the same name! (issue: '" + content.name + "')");
         }
         contentNameMap[content.getContentType().ordinal()].put(content.name, content);
     }
 
-    public void setTemporaryMapper(MappableContent[][] temporaryMapper){
+    public void setTemporaryMapper(io.anuke.mindustry.ctype.MappableContent[][] temporaryMapper){
         this.temporaryMapper = temporaryMapper;
     }
 
-    public Array<Content>[] getContentMap(){
+    public Array<io.anuke.mindustry.ctype.Content>[] getContentMap(){
         return contentMap;
     }
 
@@ -171,7 +171,7 @@ public class ContentLoader{
         return (T)contentNameMap[type.ordinal()].get(name);
     }
 
-    public <T extends Content> T getByID(ContentType type, int id){
+    public <T extends io.anuke.mindustry.ctype.Content> T getByID(ContentType type, int id){
 
         if(temporaryMapper != null && temporaryMapper[type.ordinal()] != null && temporaryMapper[type.ordinal()].length != 0){
             //-1 = invalid content
@@ -190,7 +190,7 @@ public class ContentLoader{
         return (T)contentMap[type.ordinal()].get(id);
     }
 
-    public <T extends Content> Array<T> getBy(ContentType type){
+    public <T extends io.anuke.mindustry.ctype.Content> Array<T> getBy(ContentType type){
         return (Array<T>)contentMap[type.ordinal()];
     }
 

core/src/io/anuke/mindustry/core/Logic.java

@@ -5,6 +5,7 @@ import io.anuke.arc.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.EventType.*;

core/src/io/anuke/mindustry/core/NetClient.java

@@ -16,13 +16,13 @@ import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.net.Administration.*;
 import io.anuke.mindustry.net.Net.*;
 import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.net.Packets.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.type.TypeID;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.modules.*;
 

core/src/io/anuke/mindustry/core/Renderer.java

@@ -22,6 +22,7 @@ import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.input.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
 
 import static io.anuke.arc.Core.*;

core/src/io/anuke/mindustry/core/Version.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.game;
+package io.anuke.mindustry.core;
 
 import io.anuke.arc.*;
 import io.anuke.arc.Files.*;

core/src/io/anuke/mindustry/ctype/Content.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.game;
+package io.anuke.mindustry.ctype;
 
 import io.anuke.arc.files.*;
 import io.anuke.arc.util.ArcAnnotate.*;

core/src/io/anuke/mindustry/ctype/ContentList.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.game;
+package io.anuke.mindustry.ctype;
 
 /** Interface for a list of content to be loaded in {@link io.anuke.mindustry.core.ContentLoader}. */
 public interface ContentList{

core/src/io/anuke/mindustry/ctype/MappableContent.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.game;
+package io.anuke.mindustry.ctype;
 
 import io.anuke.mindustry.*;
 

core/src/io/anuke/mindustry/ctype/UnlockableContent.java

@@ -1,10 +1,11 @@
-package io.anuke.mindustry.game;
+package io.anuke.mindustry.ctype;
 
 import io.anuke.annotations.Annotations.*;
 import io.anuke.arc.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.mindustry.*;
+import io.anuke.mindustry.ui.Cicon;
 
 /** Base interface for an unlockable content type. */
 public abstract class UnlockableContent extends MappableContent{
@@ -13,7 +14,7 @@ public abstract class UnlockableContent extends MappableContent{
     /** Localized description. May be null. */
     public String description;
     /** Icons by Cicon ID.*/
-    protected TextureRegion[] cicons = new TextureRegion[Cicon.all.length];
+    protected TextureRegion[] cicons = new TextureRegion[io.anuke.mindustry.ui.Cicon.all.length];
 
     public UnlockableContent(String name){
         super(name);

core/src/io/anuke/mindustry/editor/MapEditorDialog.java

@@ -25,6 +25,7 @@ import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.io.*;
 import io.anuke.mindustry.maps.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.ui.dialogs.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;

core/src/io/anuke/mindustry/editor/WaveInfoDialog.java

@@ -17,6 +17,7 @@ import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.io.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.ui.dialogs.*;
 
 import static io.anuke.mindustry.Vars.*;
@@ -140,7 +141,7 @@ public class WaveInfoDialog extends FloatingDialog{
                     t.margin(0).defaults().pad(3).padLeft(5f).growX().left();
                     t.addButton(b -> {
                         b.left();
-                        b.addImage(group.type.icon(Cicon.medium)).size(32f).padRight(3);
+                        b.addImage(group.type.icon(io.anuke.mindustry.ui.Cicon.medium)).size(32f).padRight(3);
                         b.add(group.type.localizedName).color(Pal.accent);
                     }, () -> showUpdate(group)).pad(-6f).padBottom(0f);
 
@@ -221,7 +222,7 @@ public class WaveInfoDialog extends FloatingDialog{
         for(UnitType type : content.units()){
             dialog.cont.addButton(t -> {
                 t.left();
-                t.addImage(type.icon(Cicon.medium)).size(40f).padRight(2f);
+                t.addImage(type.icon(io.anuke.mindustry.ui.Cicon.medium)).size(40f).padRight(2f);
                 t.add(type.localizedName);
             }, () -> {
                 lastType = type;

core/src/io/anuke/mindustry/entities/bullet/BulletType.java

@@ -3,12 +3,12 @@ package io.anuke.mindustry.entities.bullet;
 import io.anuke.arc.audio.*;
 import io.anuke.arc.math.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.Content;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.Effects.*;
 import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;

core/src/io/anuke/mindustry/entities/effect/Fire.java

@@ -12,8 +12,8 @@ import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.entities.type.TimedEntity;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.type.TypeID;
 import io.anuke.mindustry.world.*;
 
 import java.io.*;

core/src/io/anuke/mindustry/entities/effect/Puddle.java

@@ -16,7 +16,7 @@ import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.SolidEntity;
 import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.game.TypeID;
+import io.anuke.mindustry.type.TypeID;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;

core/src/io/anuke/mindustry/entities/traits/TypeTrait.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.entities.traits;
 
-import io.anuke.mindustry.game.TypeID;
+import io.anuke.mindustry.type.TypeID;
 
 public interface TypeTrait{
 

core/src/io/anuke/mindustry/entities/type/BaseUnit.java

@@ -16,6 +16,8 @@ import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.type.TypeID;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
 import io.anuke.mindustry.world.blocks.defense.DeflectorWall.*;

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -24,7 +24,9 @@ import io.anuke.mindustry.io.*;
 import io.anuke.mindustry.net.Administration.*;
 import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.type.TypeID;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
 

core/src/io/anuke/mindustry/entities/type/Unit.java

@@ -22,6 +22,7 @@ import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
 

core/src/io/anuke/mindustry/game/EventType.java

@@ -2,6 +2,7 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.entities.traits.BuilderTrait;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.entities.units.*;
@@ -173,15 +174,15 @@ public class EventType{
     }
 
     public static class UnlockEvent{
-        public final UnlockableContent content;
+        public final io.anuke.mindustry.ctype.UnlockableContent content;
 
-        public UnlockEvent(UnlockableContent content){
+        public UnlockEvent(io.anuke.mindustry.ctype.UnlockableContent content){
             this.content = content;
         }
     }
 
     public static class ResearchEvent{
-        public final UnlockableContent content;
+        public final io.anuke.mindustry.ctype.UnlockableContent content;
 
         public ResearchEvent(UnlockableContent content){
             this.content = content;

core/src/io/anuke/mindustry/game/GlobalData.java

@@ -6,6 +6,7 @@ import io.anuke.arc.files.*;
 import io.anuke.arc.util.io.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.type.*;
 
@@ -131,7 +132,7 @@ public class GlobalData{
     }
 
     /** Returns whether or not this piece of content is unlocked yet. */
-    public boolean isUnlocked(UnlockableContent content){
+    public boolean isUnlocked(io.anuke.mindustry.ctype.UnlockableContent content){
         return content.alwaysUnlocked() || unlocked.getOr(content.getContentType(), ObjectSet::new).contains(content.name);
     }
 

core/src/io/anuke/mindustry/graphics/BlockRenderer.java

@@ -12,6 +12,7 @@ import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.Teams.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 
 import static io.anuke.arc.Core.camera;

core/src/io/anuke/mindustry/graphics/MenuRenderer.java

@@ -14,8 +14,8 @@ import io.anuke.arc.util.noise.RidgedPerlin;
 import io.anuke.arc.util.noise.Simplex;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.content.UnitTypes;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.UnitType;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.OreBlock;

core/src/io/anuke/mindustry/graphics/OverlayRenderer.java

@@ -12,6 +12,7 @@ import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.input.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 
 import static io.anuke.mindustry.Vars.*;

core/src/io/anuke/mindustry/io/JsonIO.java

@@ -4,6 +4,7 @@ import io.anuke.arc.util.serialization.*;
 import io.anuke.arc.util.serialization.Json.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.MappableContent;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
@@ -18,7 +19,7 @@ public class JsonIO{
 
         @Override
         public void writeValue(Object value, Class knownType, Class elementType){
-            if(value instanceof MappableContent){
+            if(value instanceof io.anuke.mindustry.ctype.MappableContent){
                 try{
                     getWriter().value(((MappableContent)value).name);
                 }catch(IOException e){

core/src/io/anuke/mindustry/io/MapIO.java

@@ -6,6 +6,7 @@ import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.Pixmap.*;
 import io.anuke.arc.util.io.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.maps.*;
 import io.anuke.mindustry.world.*;

core/src/io/anuke/mindustry/io/SaveVersion.java

@@ -3,12 +3,15 @@ package io.anuke.mindustry.io;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.io.*;
+import io.anuke.mindustry.core.Version;
+import io.anuke.mindustry.ctype.MappableContent;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.Teams.*;
 import io.anuke.mindustry.maps.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.type.TypeID;
 import io.anuke.mindustry.world.*;
 
 import java.io.*;
@@ -280,12 +283,12 @@ public abstract class SaveVersion extends SaveFileReader{
     public void readContentHeader(DataInput stream) throws IOException{
         byte mapped = stream.readByte();
 
-        MappableContent[][] map = new MappableContent[ContentType.values().length][0];
+        io.anuke.mindustry.ctype.MappableContent[][] map = new io.anuke.mindustry.ctype.MappableContent[ContentType.values().length][0];
 
         for(int i = 0; i < mapped; i++){
             ContentType type = ContentType.values()[stream.readByte()];
             short total = stream.readShort();
-            map[type.ordinal()] = new MappableContent[total];
+            map[type.ordinal()] = new io.anuke.mindustry.ctype.MappableContent[total];
 
             for(int j = 0; j < total; j++){
                 String name = stream.readUTF();
@@ -297,21 +300,21 @@ public abstract class SaveVersion extends SaveFileReader{
     }
 
     public void writeContentHeader(DataOutput stream) throws IOException{
-        Array<Content>[] map = content.getContentMap();
+        Array<io.anuke.mindustry.ctype.Content>[] map = content.getContentMap();
 
         int mappable = 0;
-        for(Array<Content> arr : map){
+        for(Array<io.anuke.mindustry.ctype.Content> arr : map){
-            if(arr.size > 0 && arr.first() instanceof MappableContent){
+            if(arr.size > 0 && arr.first() instanceof io.anuke.mindustry.ctype.MappableContent){
                 mappable++;
             }
         }
 
         stream.writeByte(mappable);
-        for(Array<Content> arr : map){
+        for(Array<io.anuke.mindustry.ctype.Content> arr : map){
-            if(arr.size > 0 && arr.first() instanceof MappableContent){
+            if(arr.size > 0 && arr.first() instanceof io.anuke.mindustry.ctype.MappableContent){
                 stream.writeByte(arr.first().getContentType().ordinal());
                 stream.writeShort(arr.size);
-                for(Content c : arr){
+                for(io.anuke.mindustry.ctype.Content c : arr){
                     stream.writeUTF(((MappableContent)c).name);
                 }
             }

core/src/io/anuke/mindustry/io/versions/Save2.java

@@ -1,9 +1,9 @@
 package io.anuke.mindustry.io.versions;
 
 import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.io.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.type.TypeID;
 
 import java.io.*;
 

core/src/io/anuke/mindustry/maps/MapPreviewLoader.java

@@ -8,7 +8,7 @@ import io.anuke.arc.files.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.ctype.Content;
 
 public class MapPreviewLoader extends TextureLoader{
 

core/src/io/anuke/mindustry/maps/Maps.java

@@ -13,6 +13,7 @@ import io.anuke.arc.util.async.*;
 import io.anuke.arc.util.io.*;
 import io.anuke.arc.util.serialization.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.Content;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.io.*;

core/src/io/anuke/mindustry/maps/filters/FilterOption.java

@@ -8,7 +8,7 @@ import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.ui.dialogs.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
@@ -16,12 +16,12 @@ import io.anuke.mindustry.world.blocks.*;
 import static io.anuke.mindustry.Vars.updateEditorOnChange;
 
 public abstract class FilterOption{
-    public static final Predicate<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Cicon.full));
+    public static final Predicate<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full));
-    public static final Predicate<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && Core.atlas.isFound(b.icon(Cicon.full));
+    public static final Predicate<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full));
-    public static final Predicate<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Cicon.full)));
+    public static final Predicate<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full)));
-    public static final Predicate<Block> wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && Core.atlas.isFound(b.icon(Cicon.full)));
+    public static final Predicate<Block> wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full)));
-    public static final Predicate<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(Cicon.full)));
+    public static final Predicate<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full)));
-    public static final Predicate<Block> oresOnly = b -> b instanceof OverlayFloor && Core.atlas.isFound(b.icon(Cicon.full));
+    public static final Predicate<Block> oresOnly = b -> b instanceof OverlayFloor && Core.atlas.isFound(b.icon(io.anuke.mindustry.ui.Cicon.full));
     public static final Predicate<Block> anyOptional = b -> floorsOnly.test(b) || wallsOnly.test(b) || oresOnly.test(b) || b == Blocks.air;
 
     public abstract void build(Table table);
@@ -76,8 +76,8 @@ public abstract class FilterOption{
 
         @Override
         public void build(Table table){
-            table.addButton(b -> b.addImage(supplier.get().icon(Cicon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable())
+            table.addButton(b -> b.addImage(supplier.get().icon(io.anuke.mindustry.ui.Cicon.small)).update(i -> ((TextureRegionDrawable)i.getDrawable())
-                .setRegion(supplier.get() == Blocks.air ? Core.atlas.find("icon-none") : supplier.get().icon(Cicon.small))).size(8 * 3), () -> {
+                .setRegion(supplier.get() == Blocks.air ? Core.atlas.find("icon-none") : supplier.get().icon(io.anuke.mindustry.ui.Cicon.small))).size(8 * 3), () -> {
                 FloatingDialog dialog = new FloatingDialog("");
                 dialog.setFillParent(false);
                 int i = 0;

core/src/io/anuke/mindustry/mod/ContentParser.java

@@ -16,6 +16,7 @@ import io.anuke.arc.util.serialization.Json.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.content.TechTree.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.entities.Effects.*;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.type.*;
@@ -72,7 +73,7 @@ public class ContentParser{
     private Array<Runnable> reads = new Array<>();
     private Array<Runnable> postreads = new Array<>();
     private LoadedMod currentMod;
-    private Content currentContent;
+    private io.anuke.mindustry.ctype.Content currentContent;
 
     private Json parser = new Json(){
         @Override
@@ -92,7 +93,7 @@ public class ContentParser{
                     }
                 }
 
-                if(Content.class.isAssignableFrom(type)){
+                if(io.anuke.mindustry.ctype.Content.class.isAssignableFrom(type)){
                     ContentType ctype = contentTypes.getThrow(type, () -> new IllegalArgumentException("No content type for class: " + type.getSimpleName()));
                     String prefix = currentMod != null ? currentMod.name + "-" : "";
                     T one = (T)Vars.content.getByName(ctype, prefix + jsonData.asString());
@@ -212,14 +213,14 @@ public class ContentParser{
         ContentType.zone, parser(ContentType.zone, Zone::new)
     );
 
-    private <T extends Content> T find(ContentType type, String name){
+    private <T extends io.anuke.mindustry.ctype.Content> T find(ContentType type, String name){
-        Content c = Vars.content.getByName(type, name);
+        io.anuke.mindustry.ctype.Content c = Vars.content.getByName(type, name);
         if(c == null) c = Vars.content.getByName(type, currentMod.name + "-" + name);
         if(c == null) throw new IllegalArgumentException("No " + type + " found with name '" + name + "'");
         return (T)c;
     }
 
-    private <T extends Content> TypeParser<T> parser(ContentType type, Function<String, T> constructor){
+    private <T extends io.anuke.mindustry.ctype.Content> TypeParser<T> parser(ContentType type, Function<String, T> constructor){
         return (mod, name, value) -> {
             T item;
             if(Vars.content.getByName(type, name) != null){
@@ -236,7 +237,7 @@ public class ContentParser{
     }
 
     private void readBundle(ContentType type, String name, JsonValue value){
-        UnlockableContent cont = Vars.content.getByName(type, name) instanceof UnlockableContent ?
+        io.anuke.mindustry.ctype.UnlockableContent cont = Vars.content.getByName(type, name) instanceof io.anuke.mindustry.ctype.UnlockableContent ?
                                 Vars.content.getByName(type, name) : null;
 
         String entryName = cont == null ? type + "." + currentMod.name + "-" + name + "." : type + "." + cont.name + ".";
@@ -258,7 +259,7 @@ public class ContentParser{
 
     /** Call to read a content's extra info later.*/
     private void read(Runnable run){
-        Content cont = currentContent;
+        io.anuke.mindustry.ctype.Content cont = currentContent;
         LoadedMod mod = currentMod;
         reads.add(() -> {
             this.currentMod = mod;
@@ -269,11 +270,11 @@ public class ContentParser{
 
     private void init(){
         for(ContentType type : ContentType.all){
-            Array<Content> arr = Vars.content.getBy(type);
+            Array<io.anuke.mindustry.ctype.Content> arr = Vars.content.getBy(type);
             if(!arr.isEmpty()){
                 Class<?> c = arr.first().getClass();
                 //get base content class, skipping intermediates
-                while(!(c.getSuperclass() == Content.class || c.getSuperclass() == UnlockableContent.class || Modifier.isAbstract(c.getSuperclass().getModifiers()))){
+                while(!(c.getSuperclass() == io.anuke.mindustry.ctype.Content.class || c.getSuperclass() == UnlockableContent.class || Modifier.isAbstract(c.getSuperclass().getModifiers()))){
                     c = c.getSuperclass();
                 }
 
@@ -301,7 +302,7 @@ public class ContentParser{
      * @param file file that this content is being parsed from
      * @return the content that was parsed
      */
-    public Content parse(LoadedMod mod, String name, String json, FileHandle file, ContentType type) throws Exception{
+    public io.anuke.mindustry.ctype.Content parse(LoadedMod mod, String name, String json, FileHandle file, ContentType type) throws Exception{
         if(contentTypes.isEmpty()){
             init();
         }
@@ -313,7 +314,7 @@ public class ContentParser{
 
         currentMod = mod;
         boolean exists = Vars.content.getByName(type, name) != null;
-        Content c = parsers.get(type).parse(mod.name, name, value);
+        io.anuke.mindustry.ctype.Content c = parsers.get(type).parse(mod.name, name, value);
         if(!exists){
             c.sourceFile = file;
             c.mod = mod;
@@ -453,7 +454,7 @@ public class ContentParser{
         Object parse(Class<?> type, JsonValue value) throws Exception;
     }
 
-    private interface TypeParser<T extends Content>{
+    private interface TypeParser<T extends io.anuke.mindustry.ctype.Content>{
         T parse(String mod, String name, JsonValue value) throws Exception;
     }
 

core/src/io/anuke/mindustry/mod/Mods.java

@@ -14,7 +14,8 @@ import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.io.*;
 import io.anuke.arc.util.serialization.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.core.Version;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.plugin.*;
@@ -129,10 +130,10 @@ public class Mods implements Loadable{
 
             packer.updateTextureAtlas(Core.atlas, filter, filter, false);
             //generate new icons
-            for(Array<Content> arr : content.getContentMap()){
+            for(Array<io.anuke.mindustry.ctype.Content> arr : content.getContentMap()){
                 arr.each(c -> {
-                    if(c instanceof UnlockableContent && c.mod != null){
+                    if(c instanceof io.anuke.mindustry.ctype.UnlockableContent && c.mod != null){
-                        UnlockableContent u = (UnlockableContent)c;
+                        io.anuke.mindustry.ctype.UnlockableContent u = (io.anuke.mindustry.ctype.UnlockableContent)c;
                         u.createIcons(packer, editorPacker);
                     }
                 });
@@ -284,9 +285,9 @@ public class Mods implements Loadable{
                                 if(file.extension().equals("json")){
                                     try{
                                         //this binds the content but does not load it entirely
-                                        Content loaded = parser.parse(mod, file.nameWithoutExtension(), file.readString("UTF-8"), file, type);
+                                        io.anuke.mindustry.ctype.Content loaded = parser.parse(mod, file.nameWithoutExtension(), file.readString("UTF-8"), file, type);
                                         Log.info("[{0}] Loaded '{1}'.", mod.meta.name,
-                                        (loaded instanceof UnlockableContent ? ((UnlockableContent)loaded).localizedName : loaded));
+                                        (loaded instanceof io.anuke.mindustry.ctype.UnlockableContent ? ((UnlockableContent)loaded).localizedName : loaded));
                                     }catch(Exception e){
                                         throw new RuntimeException("Failed to parse content file '" + file + "' for mod '" + mod.meta.name + "'.", e);
                                     }
@@ -361,7 +362,7 @@ public class Mods implements Loadable{
 
     public void handleError(Throwable t, LoadedMod mod){
         Array<Throwable> causes = Strings.getCauses(t);
-        Content content = null;
+        io.anuke.mindustry.ctype.Content content = null;
         for(Throwable e : causes){
             if(e instanceof ModLoadException && ((ModLoadException) e).content != null){
                 content = ((ModLoadException) e).content;
@@ -552,14 +553,14 @@ public class Mods implements Loadable{
 
     /** Thrown when an error occurs while loading a mod.*/
     public static class ModLoadException extends RuntimeException{
-        public Content content;
+        public io.anuke.mindustry.ctype.Content content;
         public LoadedMod mod;
 
         public ModLoadException(String message, Throwable cause){
             super(message, cause);
         }
 
-        public ModLoadException(String message, @Nullable Content content, Throwable cause){
+        public ModLoadException(String message, @Nullable io.anuke.mindustry.ctype.Content content, Throwable cause){
             super(message, cause);
             this.content = content;
             if(content != null){

core/src/io/anuke/mindustry/net/CrashSender.java

@@ -11,7 +11,7 @@ import io.anuke.arc.util.serialization.*;
 import io.anuke.arc.util.serialization.JsonValue.*;
 import io.anuke.arc.util.serialization.JsonWriter.*;
 import io.anuke.mindustry.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.core.Version;
 
 import java.io.*;
 import java.text.*;
@@ -26,23 +26,23 @@ public class CrashSender{
             exception.printStackTrace();
 
             //don't create crash logs for custom builds, as it's expected
-            if(Version.build == -1 || (System.getProperty("user.name").equals("anuke") && "release".equals(Version.modifier))) return;
+            if(io.anuke.mindustry.core.Version.build == -1 || (System.getProperty("user.name").equals("anuke") && "release".equals(io.anuke.mindustry.core.Version.modifier))) return;
 
             //attempt to load version regardless
-            if(Version.number == 0){
+            if(io.anuke.mindustry.core.Version.number == 0){
                 try{
                     ObjectMap<String, String> map = new ObjectMap<>();
                     PropertiesUtils.load(map, new InputStreamReader(CrashSender.class.getResourceAsStream("/version.properties")));
 
-                    Version.type = map.get("type");
+                    io.anuke.mindustry.core.Version.type = map.get("type");
-                    Version.number = Integer.parseInt(map.get("number"));
+                    io.anuke.mindustry.core.Version.number = Integer.parseInt(map.get("number"));
-                    Version.modifier = map.get("modifier");
+                    io.anuke.mindustry.core.Version.modifier = map.get("modifier");
                     if(map.get("build").contains(".")){
                         String[] split = map.get("build").split("\\.");
-                        Version.build = Integer.parseInt(split[0]);
+                        io.anuke.mindustry.core.Version.build = Integer.parseInt(split[0]);
-                        Version.revision = Integer.parseInt(split[1]);
+                        io.anuke.mindustry.core.Version.revision = Integer.parseInt(split[1]);
                     }else{
-                        Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
+                        io.anuke.mindustry.core.Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
                     }
                 }catch(Throwable ignored){
                     ignored.printStackTrace();
@@ -70,7 +70,7 @@ public class CrashSender{
             }
 
             //do not send exceptions that occur for versions that can't be parsed
-            if(Version.number == 0){
+            if(io.anuke.mindustry.core.Version.number == 0){
                 return;
             }
 
@@ -89,10 +89,10 @@ public class CrashSender{
             boolean fn = netActive, fs = netServer;
 
             //add all relevant info, ignoring exceptions
-            ex(() -> value.addChild("versionType", new JsonValue(Version.type)));
+            ex(() -> value.addChild("versionType", new JsonValue(io.anuke.mindustry.core.Version.type)));
-            ex(() -> value.addChild("versionNumber", new JsonValue(Version.number)));
+            ex(() -> value.addChild("versionNumber", new JsonValue(io.anuke.mindustry.core.Version.number)));
-            ex(() -> value.addChild("versionModifier", new JsonValue(Version.modifier)));
+            ex(() -> value.addChild("versionModifier", new JsonValue(io.anuke.mindustry.core.Version.modifier)));
-            ex(() -> value.addChild("build", new JsonValue(Version.build)));
+            ex(() -> value.addChild("build", new JsonValue(io.anuke.mindustry.core.Version.build)));
             ex(() -> value.addChild("revision", new JsonValue(Version.revision)));
             ex(() -> value.addChild("net", new JsonValue(fn)));
             ex(() -> value.addChild("server", new JsonValue(fs)));

core/src/io/anuke/mindustry/net/NetworkIO.java

@@ -2,6 +2,7 @@ package io.anuke.mindustry.net;
 
 import io.anuke.arc.*;
 import io.anuke.arc.util.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.io.*;
@@ -67,7 +68,7 @@ public class NetworkIO{
 
         buffer.putInt(playerGroup.size());
         buffer.putInt(state.wave);
-        buffer.putInt(Version.build);
+        buffer.putInt(io.anuke.mindustry.core.Version.build);
         writeString(buffer, Version.type);
 
         buffer.put((byte)Gamemode.bestFit(state.rules).ordinal());

core/src/io/anuke/mindustry/net/Packets.java

@@ -3,7 +3,7 @@ package io.anuke.mindustry.net;
 import io.anuke.arc.Core;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.util.serialization.Base64Coder;
-import io.anuke.mindustry.game.Version;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.io.TypeIO;
 
 import java.nio.ByteBuffer;

core/src/io/anuke/mindustry/type/Item.java

@@ -4,7 +4,7 @@ import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.ui.*;
 import io.anuke.mindustry.world.blocks.*;
 

core/src/io/anuke/mindustry/type/Liquid.java

@@ -4,7 +4,7 @@ import io.anuke.arc.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.ui.*;
 
 public class Liquid extends UnlockableContent{

core/src/io/anuke/mindustry/type/Loadout.java

@@ -2,7 +2,7 @@ package io.anuke.mindustry.type;
 
 import io.anuke.arc.collection.*;
 import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.ctype.Content;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.storage.*;
 

core/src/io/anuke/mindustry/type/Mech.java

@@ -5,7 +5,7 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.mindustry.entities.type.Player;
-import io.anuke.mindustry.game.UnlockableContent;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.ui.ContentDisplay;
 

core/src/io/anuke/mindustry/type/StatusEffect.java

@@ -11,7 +11,7 @@ import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.Effects.Effect;
 import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.entities.units.Statuses.StatusEntry;
-import io.anuke.mindustry.game.Content;
+import io.anuke.mindustry.ctype.Content;
 
 public class StatusEffect extends Content{
     public float damageMultiplier = 1f; //damage dealt

core/src/io/anuke/mindustry/type/TypeID.java

@@ -1,8 +1,8 @@
-package io.anuke.mindustry.game;
+package io.anuke.mindustry.type;
 
-import io.anuke.arc.function.Supplier;
+import io.anuke.arc.function.*;
-import io.anuke.mindustry.entities.traits.TypeTrait;
+import io.anuke.mindustry.ctype.*;
-import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.entities.traits.*;
 
 public class TypeID extends MappableContent{
     public final Supplier<? extends TypeTrait> constructor;

core/src/io/anuke/mindustry/type/UnitType.java

@@ -8,6 +8,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;

core/src/io/anuke/mindustry/type/WeatherEvent.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.type;
 
-import io.anuke.mindustry.game.Content;
+import io.anuke.mindustry.ctype.Content;
 
 //currently unimplemented, see trello for implementation plans
 public class WeatherEvent extends Content{

core/src/io/anuke/mindustry/type/Zone.java

@@ -7,6 +7,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.Objectives.*;

core/src/io/anuke/mindustry/ui/Cicon.java

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.game;
+package io.anuke.mindustry.ui;
 
 import java.util.*;
 

core/src/io/anuke/mindustry/ui/ContentDisplay.java

@@ -5,7 +5,6 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;

core/src/io/anuke/mindustry/ui/ItemImage.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.ui;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
 
 public class ItemImage extends Stack{

core/src/io/anuke/mindustry/ui/ItemsDisplay.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.ui;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
 

core/src/io/anuke/mindustry/ui/LiquidDisplay.java

@@ -5,7 +5,6 @@ import io.anuke.arc.scene.ui.Image;
 import io.anuke.arc.scene.ui.layout.Stack;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Strings;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.meta.StatUnit;
 

core/src/io/anuke/mindustry/ui/dialogs/ContentInfoDialog.java

@@ -2,7 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
 
 import io.anuke.arc.scene.ui.ScrollPane;
 import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.mindustry.game.UnlockableContent;
+import io.anuke.mindustry.ctype.UnlockableContent;
 
 public class ContentInfoDialog extends FloatingDialog{
 

core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java

@@ -15,6 +15,7 @@ import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 
 import static io.anuke.mindustry.Vars.*;

core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java

@@ -10,10 +10,11 @@ import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.ui.Cicon;
 
 public class DatabaseDialog extends FloatingDialog{
 
@@ -33,12 +34,12 @@ public class DatabaseDialog extends FloatingDialog{
         table.margin(20);
         ScrollPane pane = new ScrollPane(table);
 
-        Array<Content>[] allContent = Vars.content.getContentMap();
+        Array<io.anuke.mindustry.ctype.Content>[] allContent = Vars.content.getContentMap();
 
         for(int j = 0; j < allContent.length; j++){
             ContentType type = ContentType.values()[j];
 
-            Array<Content> array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden());
+            Array<io.anuke.mindustry.ctype.Content> array = allContent[j].select(c -> c instanceof io.anuke.mindustry.ctype.UnlockableContent && !((io.anuke.mindustry.ctype.UnlockableContent)c).isHidden());
             if(array.size == 0) continue;
 
             table.add("$content." + type.name() + ".name").growX().left().color(Pal.accent);
@@ -53,7 +54,7 @@ public class DatabaseDialog extends FloatingDialog{
                 int count = 0;
 
                 for(int i = 0; i < array.size; i++){
-                    UnlockableContent unlock = (UnlockableContent)array.get(i);
+                    io.anuke.mindustry.ctype.UnlockableContent unlock = (io.anuke.mindustry.ctype.UnlockableContent)array.get(i);
 
                     Image image = unlocked(unlock) ? new Image(unlock.icon(Cicon.medium)) : new Image(Icon.lockedSmall, Pal.gray);
                     list.add(image).size(8*4).pad(3);

core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java

@@ -6,6 +6,7 @@ import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.Stats.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java

@@ -5,7 +5,7 @@ import io.anuke.arc.graphics.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.ui.*;
 

core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java

@@ -10,7 +10,7 @@ import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.net.Packets.*;
@@ -105,9 +105,9 @@ public class JoinDialog extends FloatingDialog{
 
             TextButton button = buttons[0] = remote.addButton("[accent]" + server.displayIP(), Styles.cleart, () -> {
                 if(!buttons[0].childrenPressed()){
-                    if(server.lastHost != null && server.lastHost.version != Version.build && Version.build != -1 && server.lastHost.version != -1){
+                    if(server.lastHost != null && server.lastHost.version != io.anuke.mindustry.core.Version.build && io.anuke.mindustry.core.Version.build != -1 && server.lastHost.version != -1){
-                        ui.showInfo("[scarlet]" + (server.lastHost.version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" +
+                        ui.showInfo("[scarlet]" + (server.lastHost.version > io.anuke.mindustry.core.Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" +
-                                Core.bundle.format("server.versions", Version.build, server.lastHost.version));
+                                Core.bundle.format("server.versions", io.anuke.mindustry.core.Version.build, server.lastHost.version));
                     }else{
                         connect(server.ip, server.port);
                     }
@@ -196,13 +196,13 @@ public class JoinDialog extends FloatingDialog{
             versionString = Core.bundle.format("server.version", Core.bundle.get("server.custombuild"), "");
         }else if(host.version == 0){
             versionString = Core.bundle.get("server.outdated");
-        }else if(host.version < Version.build && Version.build != -1){
+        }else if(host.version < io.anuke.mindustry.core.Version.build && io.anuke.mindustry.core.Version.build != -1){
             versionString = Core.bundle.get("server.outdated") + "\n" +
             Core.bundle.format("server.version", host.version, "");
-        }else if(host.version > Version.build && Version.build != -1){
+        }else if(host.version > io.anuke.mindustry.core.Version.build && io.anuke.mindustry.core.Version.build != -1){
             versionString = Core.bundle.get("server.outdated.client") + "\n" +
             Core.bundle.format("server.version", host.version, "");
-        }else if(host.version == Version.build && Version.type.equals(host.versionType)){
+        }else if(host.version == io.anuke.mindustry.core.Version.build && Version.type.equals(host.versionType)){
             //not important
             versionString = "";
         }else{

core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java

@@ -5,10 +5,10 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.input.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/ui/dialogs/SchematicsDialog.java

@@ -16,6 +16,7 @@ import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -14,7 +14,7 @@ import io.anuke.arc.scene.ui.TextButton.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.core.GameState.*;
-import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;

core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java

@@ -16,12 +16,12 @@ import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.content.TechTree.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.ui.layout.*;
 import io.anuke.mindustry.ui.layout.TreeLayout.*;
 

core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java

@@ -10,6 +10,7 @@ import io.anuke.mindustry.game.Objectives.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -44,7 +45,7 @@ public class ZoneInfoDialog extends FloatingDialog{
                 if(i++ % 2 == 0){
                     iteminfo.row();
                 }
-                iteminfo.addImage(stack.item.icon(Cicon.small)).size(8 * 3).padRight(1);
+                iteminfo.addImage(stack.item.icon(io.anuke.mindustry.ui.Cicon.small)).size(8 * 3).padRight(1);
                 iteminfo.add(stack.amount + "").color(Color.lightGray).padRight(5);
             }
         };
@@ -84,7 +85,7 @@ public class ZoneInfoDialog extends FloatingDialog{
                             r.add("$research.list").colspan(2).left();
                             r.row();
                             for(Unlock blocko : blocks){
-                                r.addImage(blocko.block.icon(Cicon.small)).size(8 * 3).padRight(5);
+                                r.addImage(blocko.block.icon(io.anuke.mindustry.ui.Cicon.small)).size(8 * 3).padRight(5);
                                 r.add(blocko.block.localizedName).color(Color.lightGray).left();
                                 r.addImage(blocko.block.unlocked() ? Icon.checkSmall : Icon.cancelSmall, blocko.block.unlocked() ? Color.lightGray : Color.scarlet).padLeft(3);
                                 r.row();

core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java

@@ -17,10 +17,10 @@ import io.anuke.arc.util.*;
 import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 
 import static io.anuke.mindustry.Vars.*;

core/src/io/anuke/mindustry/ui/fragments/HudFragment.java

@@ -17,6 +17,7 @@ import io.anuke.arc.scene.ui.ImageButton.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.core.GameState.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
@@ -27,6 +28,7 @@ import io.anuke.mindustry.input.*;
 import io.anuke.mindustry.net.Packets.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.ui.dialogs.*;
 
 import static io.anuke.mindustry.Vars.*;

core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java

@@ -11,8 +11,8 @@ import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.ui.*;
@@ -65,7 +65,7 @@ public class MenuFragment extends Fragment{
             parent.fill(c -> c.bottom().right().addButton("", Styles.discordt, ui.discord::show).size(84, 45));
         }
 
-        String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : (Version.type.equals("official") ? Version.modifier : Version.type) + " build " + Version.build + (Version.revision == 0 ? "" : "." + Version.revision));
+        String versionText = "[#ffffffba]" + ((io.anuke.mindustry.core.Version.build == -1) ? "[#fc8140aa]custom build" : (io.anuke.mindustry.core.Version.type.equals("official") ? io.anuke.mindustry.core.Version.modifier : io.anuke.mindustry.core.Version.type) + " build " + io.anuke.mindustry.core.Version.build + (io.anuke.mindustry.core.Version.revision == 0 ? "" : "." + Version.revision));
 
         parent.fill((x, y, w, h) -> {
             Texture logo = Core.assets.get("sprites/logo.png");

core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java

@@ -12,13 +12,13 @@ import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.input.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 
 import static io.anuke.mindustry.Vars.*;

core/src/io/anuke/mindustry/world/Block.java

@@ -17,15 +17,16 @@ import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.arc.util.pooling.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.blocks.*;
 import io.anuke.mindustry.world.blocks.power.*;
 import io.anuke.mindustry.world.consumers.*;
@@ -696,7 +697,7 @@ public class Block extends BlockStorage{
 
     }
 
-    public void drawRequestConfigCenter(BuildRequest req, Content content, String region){
+    public void drawRequestConfigCenter(BuildRequest req, io.anuke.mindustry.ctype.Content content, String region){
         Color color = content instanceof Item ? ((Item)content).color : content instanceof Liquid ? ((Liquid)content).color : null;
         if(color == null) return;
 

core/src/io/anuke/mindustry/world/BlockStorage.java

@@ -10,7 +10,7 @@ import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.game.UnlockableContent;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.consumers.Consumers;

core/src/io/anuke/mindustry/world/LegacyColorMapper.java

@@ -3,7 +3,7 @@ package io.anuke.mindustry.world;
 import io.anuke.arc.collection.IntMap;
 import io.anuke.arc.graphics.Color;
 import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.game.ContentList;
+import io.anuke.mindustry.ctype.ContentList;
 import io.anuke.mindustry.world.blocks.Floor;
 
 public class LegacyColorMapper implements ContentList{

core/src/io/anuke/mindustry/world/blocks/BuildBlock.java

@@ -17,6 +17,7 @@ import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.modules.*;
 
@@ -90,7 +91,7 @@ public class BuildBlock extends Block{
     @Override
     public TextureRegion getDisplayIcon(Tile tile){
         BuildEntity entity = tile.entity();
-        return (entity.cblock == null ? entity.previous : entity.cblock).icon(Cicon.full);
+        return (entity.cblock == null ? entity.previous : entity.cblock).icon(io.anuke.mindustry.ui.Cicon.full);
     }
 
     @Override
@@ -135,7 +136,7 @@ public class BuildBlock extends Block{
 
         if(entity.previous == null) return;
 
-        if(Core.atlas.isFound(entity.previous.icon(Cicon.full))){
+        if(Core.atlas.isFound(entity.previous.icon(io.anuke.mindustry.ui.Cicon.full))){
             Draw.rect(entity.previous.icon(Cicon.full), tile.drawx(), tile.drawy(), entity.previous.rotate ? tile.rotation() * 90 : 0);
         }
     }

core/src/io/anuke/mindustry/world/blocks/Floor.java

@@ -9,8 +9,8 @@ import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.Effects.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 
 import static io.anuke.mindustry.Vars.tilesize;

core/src/io/anuke/mindustry/world/blocks/ItemSelection.java

@@ -5,10 +5,10 @@ import io.anuke.arc.function.*;
 import io.anuke.arc.scene.style.*;
 import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.scene.ui.layout.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 
 import static io.anuke.mindustry.Vars.*;
 

core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java

@@ -7,11 +7,11 @@ import io.anuke.mindustry.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.bullet.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.consumers.*;
 import io.anuke.mindustry.world.meta.*;

core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java

@@ -9,10 +9,10 @@ import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.blocks.*;
 import io.anuke.mindustry.world.meta.*;

core/src/io/anuke/mindustry/world/blocks/production/Drill.java

@@ -10,11 +10,11 @@ import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.Effects.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.meta.*;
 

core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java

@@ -10,10 +10,10 @@ import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 
 import java.io.*;

core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java

@@ -10,13 +10,13 @@ import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.Bar;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.consumers.ConsumeItems;

core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java

@@ -5,9 +5,9 @@ import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.meta.*;
 import io.anuke.mindustry.world.meta.values.*;

core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java

@@ -4,9 +4,9 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.meta.*;
 import io.anuke.mindustry.world.meta.values.*;

core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java

@@ -4,9 +4,9 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.ArcAnnotate.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.meta.*;
 

core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java

@@ -4,8 +4,8 @@ import io.anuke.arc.collection.*;
 import io.anuke.arc.function.Predicate;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.type.Liquid;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.ui.MultiReqImage;
 import io.anuke.mindustry.ui.ReqImage;
 import io.anuke.mindustry.world.Tile;

core/src/io/anuke/mindustry/world/meta/Producers.java

@@ -1,6 +1,6 @@
 package io.anuke.mindustry.world.meta;
 
-import io.anuke.mindustry.game.Content;
+import io.anuke.mindustry.ctype.Content;
 
 public class Producers{
     private Content output;

core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java

@@ -7,9 +7,10 @@ import io.anuke.arc.math.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.ctype.UnlockableContent;
 import io.anuke.mindustry.entities.bullet.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.meta.*;
 
 import static io.anuke.mindustry.Vars.tilesize;

core/src/io/anuke/mindustry/world/meta/values/BoosterListValue.java

@@ -4,9 +4,9 @@ import io.anuke.arc.*;
 import io.anuke.arc.function.*;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.ui.Cicon;
 import io.anuke.mindustry.world.meta.*;
 
 import static io.anuke.mindustry.Vars.content;

desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java

@@ -21,7 +21,7 @@ import io.anuke.mindustry.*;
 import io.anuke.mindustry.core.GameState.*;
 import io.anuke.mindustry.desktop.steam.*;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Version;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.mod.Mods.*;
 import io.anuke.mindustry.net.*;
 import io.anuke.mindustry.net.Net.*;

desktop/src/io/anuke/mindustry/desktop/steam/SNet.java

@@ -10,7 +10,7 @@ import io.anuke.arc.function.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.pooling.*;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Version;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.net.ArcNetImpl.*;
 import io.anuke.mindustry.net.*;

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=420acdb85cd7ad6d0a7a1a4f1aff09d965267374
+archash=b87d817844e1da093b31da06870c0970176648a9

server/src/io/anuke/mindustry/server/ServerControl.java

@@ -10,6 +10,7 @@ import io.anuke.arc.util.CommandHandler.*;
 import io.anuke.arc.util.Timer.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.core.GameState.*;
+import io.anuke.mindustry.core.Version;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
@@ -133,7 +134,7 @@ public class ServerControl implements ApplicationListener{
         thread.setDaemon(true);
         thread.start();
 
-        if(Version.build == -1){
+        if(io.anuke.mindustry.core.Version.build == -1){
             warn("&lyYour server is running a custom build, which means that client checking is disabled.");
             warn("&lyIt is highly advised to specify which version you're using by building with gradle args &lc-Pbuildversion=&lm<build>&ly.");
         }
@@ -193,7 +194,7 @@ public class ServerControl implements ApplicationListener{
         });
 
         handler.register("version", "Displays server version info.", arg -> {
-            info("&lmVersion: &lyMindustry {0}-{1} {2} / build {3}", Version.number, Version.modifier, Version.type, Version.build);
+            info("&lmVersion: &lyMindustry {0}-{1} {2} / build {3}", io.anuke.mindustry.core.Version.number, io.anuke.mindustry.core.Version.modifier, io.anuke.mindustry.core.Version.type, Version.build);
             info("&lmJava Version: &ly{0}", System.getProperty("java.version"));
         });