From 93f3d6039ec02f361fe0f8d208902781c4872a74 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 3 Apr 2021 11:15:41 -0400
Subject: [PATCH] Excluded comp** from final jar

---
 build.gradle                                      | 5 +++++
 core/src/mindustry/ai/types/DefenderAI.java       | 1 -
 core/src/mindustry/entities/{comp => }/Sized.java | 2 +-
 core/src/mindustry/entities/Units.java            | 1 -
 core/src/mindustry/entities/comp/HitboxComp.java  | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)
 rename core/src/mindustry/entities/{comp => }/Sized.java (59%)

diff --git a/build.gradle b/build.gradle
index 3ed89cb676..47955e9392 100644
--- a/build.gradle
+++ b/build.gradle
@@ -395,6 +395,11 @@ project(":core"){
             destinationDir = new File(buildDir, 'javadoc')
         }
     }
+
+    //comp** classes are only used for code generation
+    jar{
+        exclude("mindustry/entities/comp/**")
+    }
 }
 
 project(":server"){
diff --git a/core/src/mindustry/ai/types/DefenderAI.java b/core/src/mindustry/ai/types/DefenderAI.java
index f59b476add..1f4275a3ac 100644
--- a/core/src/mindustry/ai/types/DefenderAI.java
+++ b/core/src/mindustry/ai/types/DefenderAI.java
@@ -2,7 +2,6 @@ package mindustry.ai.types;
 
 import arc.math.*;
 import mindustry.entities.*;
-import mindustry.entities.comp.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.world.meta.*;
diff --git a/core/src/mindustry/entities/comp/Sized.java b/core/src/mindustry/entities/Sized.java
similarity index 59%
rename from core/src/mindustry/entities/comp/Sized.java
rename to core/src/mindustry/entities/Sized.java
index 5fd73efa42..7039f0b2a5 100644
--- a/core/src/mindustry/entities/comp/Sized.java
+++ b/core/src/mindustry/entities/Sized.java
@@ -1,4 +1,4 @@
-package mindustry.entities.comp;
+package mindustry.entities;
 
 public interface Sized{
     float hitSize();
diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index fe41a01b8d..cb7d59ea41 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -6,7 +6,6 @@ import arc.math.geom.*;
 import arc.struct.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
-import mindustry.entities.comp.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
diff --git a/core/src/mindustry/entities/comp/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java
index 82576686fe..6fdab58a3e 100644
--- a/core/src/mindustry/entities/comp/HitboxComp.java
+++ b/core/src/mindustry/entities/comp/HitboxComp.java
@@ -5,6 +5,7 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.math.geom.QuadTree.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 
 @Component