Project structure refactoring

src/fos/ai/CarrierAI.java

@@ -1,6 +1,6 @@
 package fos.ai;
 
-import fos.type.blocks.campaign.ResearchCore;
+import fos.world.blocks.campaign.ResearchCore;
 import mindustry.content.*;
 import mindustry.entities.units.AIController;
 import mindustry.game.Team;

src/fos/ai/FOSPathfinder.java

@@ -7,6 +7,7 @@
 import arc.util.*;
 import fos.content.FOSTeams;
 import fos.core.*;
+import fos.mod.FOSEventTypes;
 import mindustry.content.Blocks;
 import mindustry.game.*;
 import mindustry.gen.*;

src/fos/ai/InjectorAI.java

@@ -1,7 +1,7 @@
 package fos.ai;
 
 import fos.content.FOSStatuses;
-import fos.type.bullets.InjectorBulletType;
+import fos.entities.bullet.InjectorBulletType;
 import mindustry.ai.types.GroundAI;
 import mindustry.entities.*;
 import mindustry.gen.Teamc;

src/fos/ai/bugs/BugAI.java

@@ -5,7 +5,8 @@
 import fos.ai.FOSPathfindAI;
 import fos.core.*;
 import fos.gen.*;
-import fos.type.blocks.units.BugSpawn;
+import fos.mod.FOSEventTypes;
+import fos.world.blocks.units.BugSpawn;
 import mindustry.entities.Units;
 import mindustry.entities.units.AIController;
 import mindustry.gen.*;

src/fos/ai/bugs/ScoutBugAI.java

@@ -5,6 +5,7 @@
 import arc.struct.Seq;
 import arc.util.Reflect;
 import fos.core.*;
+import fos.mod.FOSEventTypes;
 import mindustry.entities.units.AIController;
 import mindustry.game.Team;
 import mindustry.gen.Building;

src/fos/content/FOSBlocks.java

@@ -8,20 +8,21 @@
 import arc.struct.Seq;
 import arc.util.Strings;
 import fos.audio.FOSSounds;
+import fos.entities.bullet.*;
 import fos.graphics.*;
 import fos.graphics.cachelayers.FOSCacheLayers;
-import fos.type.blocks.campaign.*;
-import fos.type.blocks.crafting.ResourceExtractor;
-import fos.type.blocks.defense.*;
-import fos.type.blocks.distribution.*;
-import fos.type.blocks.environment.*;
-import fos.type.blocks.power.*;
-import fos.type.blocks.production.*;
-import fos.type.blocks.special.*;
-import fos.type.blocks.storage.DetectorCoreBlock;
-import fos.type.blocks.units.*;
+import fos.world.blocks.campaign.*;
+import fos.world.blocks.crafting.ResourceExtractor;
+import fos.world.blocks.defense.*;
+import fos.world.blocks.distribution.*;
+import fos.world.blocks.environment.*;
+import fos.world.blocks.power.*;
+import fos.world.blocks.production.*;
+import fos.world.blocks.special.*;
+import fos.world.blocks.storage.DetectorCoreBlock;
 import fos.type.bullets.*;
-import fos.type.draw.DrawOutputLiquids;
+import fos.world.draw.DrawOutputLiquids;
+import fos.world.blocks.units.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;

src/fos/content/FOSFx.java

@@ -7,7 +7,7 @@
 import arc.math.geom.*;
 import arc.util.Tmp;
 import fos.graphics.FOSPal;
-import fos.type.bullets.OhioBeamBulletType;
+import fos.entities.bullet.OhioBeamBulletType;
 import mindustry.content.Fx;
 import mindustry.entities.Effect;
 import mindustry.gen.*;

src/fos/content/FOSSectors.java

@@ -1,6 +1,6 @@
 package fos.content;
 
-import fos.type.content.ChallengeSectorPreset;
+import fos.type.ChallengeSectorPreset;
 import mindustry.type.SectorPreset;
 
 import static fos.content.FOSPlanets.lumoni;

src/fos/content/FOSStatuses.java

@@ -4,8 +4,8 @@
 import arc.graphics.g2d.*;
 import arc.util.Time;
 import fos.graphics.FOSPal;
-import fos.type.draw.FOSStats;
-import fos.type.statuses.HackedEffect;
+import fos.world.draw.FOSStats;
+import fos.type.HackedEffect;
 import mindustry.entities.Effect;
 import mindustry.gen.Unit;
 import mindustry.type.StatusEffect;

src/fos/content/FOSUnitTypes.java

@@ -8,11 +8,11 @@
 import fos.ai.*;
 import fos.ai.bugs.*;
 import fos.audio.FOSSounds;
+import fos.entities.abilities.*;
+import fos.entities.bullet.*;
 import fos.gen.*;
 import fos.graphics.*;
-import fos.type.abilities.*;
-import fos.type.bullets.*;
-import fos.type.content.WeaponSet;
+import fos.type.WeaponSet;
 import fos.type.units.types.*;
 import fos.type.units.weapons.*;
 import mindustry.ai.UnitCommand;

src/fos/content/FOSWeaponModules.java

@@ -3,9 +3,10 @@
 import arc.*;
 import arc.graphics.Color;
 import fos.audio.FOSSounds;
-import fos.type.abilities.UnitResistanceAbility;
+import fos.entities.abilities.UnitResistanceAbility;
+import fos.entities.bullet.*;
 import fos.type.bullets.*;
-import fos.type.content.WeaponSet;
+import fos.type.WeaponSet;
 import mindustry.Vars;
 import mindustry.content.Fx;
 import mindustry.entities.abilities.*;

src/fos/core/FOSMod.java

@@ -12,8 +12,7 @@
 import arc.struct.Seq;
 import arc.util.*;
 import fos.content.*;
-import fos.controllers.AcidController;
-import fos.controllers.CapsulesController;
+import fos.mod.*;
 import fos.gen.*;
 import fos.graphics.*;
 import fos.graphics.cachelayers.FOSCacheLayers;

src/fos/core/FOSVars.java

@@ -4,10 +4,9 @@
 import arc.struct.Seq;
 import fos.ai.FOSPathfinder;
 import fos.content.FOSSectors;
-import fos.controllers.*;
 import fos.files.InternalFileTree;
 import fos.graphics.FOSOreRenderer;
-import fos.io.DeathMapController;
+import fos.mod.*;
 import fos.ui.*;
 import fos.ui.menus.FOSMenuRenderer;
 import mindustry.ai.Pathfinder;

src/fos/entities/Acid.java

@@ -3,7 +3,7 @@
 import arc.math.Mathf;
 import arc.util.Time;
 import fos.content.FOSStatuses;
-import fos.controllers.AcidController;
+import fos.mod.AcidController;
 import mindustry.Vars;
 import mindustry.content.Fx;
 import mindustry.entities.Effect;

src/fos/type/abilities/AcidExplodeAbility.java → src/fos/entities/abilities/AcidExplodeAbility.java

@@ -1,10 +1,10 @@
-package fos.type.abilities;
+package fos.entities.abilities;
 
 import arc.Core;
 import arc.math.Mathf;
 import arc.scene.ui.layout.Table;
 import fos.content.FOSStatuses;
-import fos.controllers.AcidController;
+import fos.mod.AcidController;
 import fos.entities.Acid;
 import mindustry.Vars;
 import mindustry.entities.abilities.Ability;

src/fos/type/abilities/FOSAbility.java → src/fos/entities/abilities/FOSAbility.java

@@ -1,4 +1,4 @@
-package fos.type.abilities;
+package fos.entities.abilities;
 
 import arc.util.io.Reads;
 import arc.util.io.Writes;

src/fos/type/abilities/UnitResistanceAbility.java → src/fos/entities/abilities/UnitResistanceAbility.java

@@ -1,9 +1,9 @@
-package fos.type.abilities;
+package fos.entities.abilities;
 
 import arc.graphics.g2d.*;
 import arc.scene.ui.layout.Table;
 import arc.util.Strings;
-import fos.type.draw.FOSStats;
+import fos.world.draw.FOSStats;
 import mindustry.entities.abilities.Ability;
 import mindustry.gen.*;
 import mindustry.type.UnitType;

src/fos/type/bullets/InjectorBasicBulletType.java → src/fos/entities/bullet/InjectorBasicBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import fos.graphics.FOSPal;
 import mindustry.entities.bullet.BasicBulletType;

src/fos/type/bullets/InjectorBulletType.java → src/fos/entities/bullet/InjectorBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.math.Mathf;
 import fos.content.FOSStatuses;

src/fos/type/bullets/InjectorHackLaserBulletType.java → src/fos/entities/bullet/InjectorHackLaserBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.Core;
 import arc.graphics.g2d.TextureRegion;

src/fos/type/bullets/OhioBeamBulletType.java → src/fos/entities/bullet/OhioBeamBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.graphics.Color;
 import arc.graphics.g2d.*;

src/fos/type/bullets/PlasmaBall.java → src/fos/entities/bullet/PlasmaBall.java

@@ -1,10 +1,10 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.Core;
 import arc.graphics.g2d.Draw;
 import arc.math.Angles;
 import arc.math.Mathf;
-import fos.type.blocks.power.PlasmaLauncher;
+import fos.world.blocks.power.PlasmaLauncher;
 import mindustry.content.Fx;
 import mindustry.entities.bullet.BasicBulletType;
 import mindustry.gen.Bullet;

src/fos/type/bullets/ShaderTrailBasicBulletType.java → src/fos/entities/bullet/ShaderTrailBasicBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.graphics.gl.Shader;
 import arc.math.Mathf;

src/fos/type/bullets/ShieldPierceBulletType.java → src/fos/entities/bullet/ShieldPierceBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.math.Mathf;
 import arc.math.geom.Geometry;

src/fos/type/bullets/SmartBulletType.java → src/fos/entities/bullet/SmartBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.math.Mathf;
 import mindustry.entities.Mover;

src/fos/type/bullets/StickyBulletType.java → src/fos/entities/bullet/StickyBulletType.java

@@ -1,4 +1,4 @@
-package fos.type.bullets;
+package fos.entities.bullet;
 
 import arc.math.Mathf;
 import arc.math.geom.Vec2;

src/fos/io/FOSTypeIO.java

@@ -3,8 +3,8 @@
 import arc.util.*;
 import arc.util.io.*;
 import fos.gen.LumoniPlayerc;
-import fos.type.abilities.FOSAbility;
-import fos.type.content.WeaponSet;
+import fos.entities.abilities.FOSAbility;
+import fos.type.WeaponSet;
 import mindustry.entities.abilities.Ability;
 import mindustry.entities.units.WeaponMount;
 import mindustry.gen.Unitc;

src/fos/maps/generators/bases/FOSBaseGenerator.java

@@ -6,7 +6,7 @@
 import arc.struct.*;
 import arc.util.*;
 import fos.content.FOSBlocks;
-import fos.type.blocks.environment.UndergroundOreBlock;
+import fos.world.blocks.environment.UndergroundOreBlock;
 import mindustry.ai.BaseRegistry;
 import mindustry.ctype.Content;
 import mindustry.game.*;

src/fos/maps/generators/bases/LumoniBaseGenerator.java

@@ -3,7 +3,7 @@
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.Seq;
-import fos.type.blocks.environment.UndergroundOreBlock;
+import fos.world.blocks.environment.UndergroundOreBlock;
 import mindustry.ai.*;
 import mindustry.content.Blocks;
 import mindustry.game.*;

src/fos/maps/generators/bases/UxerdBaseGenerator.java

@@ -3,7 +3,7 @@
 import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.Seq;
-import fos.type.blocks.environment.UndergroundOreBlock;
+import fos.world.blocks.environment.UndergroundOreBlock;
 import mindustry.ai.BaseRegistry;
 import mindustry.game.*;
 import mindustry.gen.Building;

src/fos/controllers/AcidController.java → src/fos/mod/AcidController.java

@@ -1,4 +1,4 @@
-package fos.controllers;
+package fos.mod;
 
 import arc.Events;
 import arc.graphics.Color;

src/fos/controllers/CapsulesController.java → src/fos/mod/CapsulesController.java

@@ -1,9 +1,9 @@
-package fos.controllers;
+package fos.mod;
 
 import arc.Events;
 import arc.struct.*;
 import arc.util.*;
-import fos.type.content.LiquidCapsule;
+import fos.type.LiquidCapsule;
 import mindustry.Vars;
 import mindustry.async.AsyncProcess;
 import mindustry.ctype.*;

src/fos/io/DeathMapController.java → src/fos/mod/DeathMapController.java

@@ -1,8 +1,7 @@
-package fos.io;
+package fos.mod;
 
 import arc.Events;
 import arc.util.io.*;
-import fos.core.FOSEventTypes;
 import mindustry.game.EventType;
 import mindustry.io.*;
 

src/fos/controllers/EvolutionController.java → src/fos/mod/EvolutionController.java

@@ -1,4 +1,4 @@
-package fos.controllers;
+package fos.mod;
 
 import arc.Events;
 import arc.struct.ObjectFloatMap;

src/fos/core/FOSEventTypes.java → src/fos/mod/FOSEventTypes.java

@@ -1,4 +1,4 @@
-package fos.core;
+package fos.mod;
 
 import mindustry.world.Tile;
 

src/fos/core/RichPresenceHandler.java → src/fos/mod/RichPresenceHandler.java

@@ -1,8 +1,9 @@
-package fos.core;
+package fos.mod;
 
 import arc.Core;
 import arc.discord.DiscordRPC;
 import arc.util.*;
+import fos.core.FOSVars;
 import mindustry.gen.Groups;
 
 import static arc.discord.DiscordRPC.RichPresence;

src/fos/core/SplashTexts.java → src/fos/mod/SplashTexts.java

@@ -1,8 +1,9 @@
-package fos.core;
+package fos.mod;
 
 import arc.Core;
 import arc.math.Mathf;
 import arc.struct.Seq;
+import fos.core.FOSVars;
 
 import java.util.Calendar;
 

src/fos/controllers/WindPowerController.java → src/fos/mod/WindPowerController.java

@@ -1,11 +1,11 @@
-package fos.controllers;
+package fos.mod;
 
 import arc.Events;
 import arc.math.Mathf;
 import arc.struct.ObjectFloatMap;
 import arc.util.io.*;
 import fos.content.FOSWeathers;
-import fos.type.blocks.power.WindTurbine.WindTurbineBuild;
+import fos.world.blocks.power.WindTurbine.WindTurbineBuild;
 import mindustry.gen.Groups;
 import mindustry.io.*;
 

src/fos/net/FOSCall.java

@@ -1,8 +1,8 @@
 package fos.net;
 
 import fos.net.packets.*;
-import fos.type.blocks.special.UpgradeCenter;
-import fos.type.bullets.StickyBulletType;
+import fos.world.blocks.special.UpgradeCenter;
+import fos.entities.bullet.StickyBulletType;
 import mindustry.gen.Player;
 import mindustry.net.*;
 import mindustry.world.Tile;

src/fos/net/packets/DetonatePacket.java

@@ -1,6 +1,6 @@
 package fos.net.packets;
 
-import fos.type.bullets.StickyBulletType;
+import fos.entities.bullet.StickyBulletType;
 import mindustry.gen.Player;
 import mindustry.net.*;
 

src/fos/net/packets/UpgradePacket.java

@@ -2,7 +2,7 @@
 
 import arc.util.io.*;
 import fos.net.FOSCall;
-import fos.type.blocks.special.UpgradeCenter;
+import fos.world.blocks.special.UpgradeCenter;
 import mindustry.gen.Player;
 import mindustry.io.TypeIO;
 import mindustry.net.*;