cyka blyat

TeamOct · Mar 26, 2024 · 2e4e1f4 · 2e4e1f4
1 parent 00682e7
commit 2e4e1f4
Show file tree

Hide file tree

Showing 24 changed files with 18 additions and 46 deletions.
diff --git a/build.gradle b/build.gradle
@@ -165,9 +165,9 @@ project.tasks.copyBuildRelease { Task task ->
 }
 
 project.tasks.jar { Jar jar ->
-    jar.archiveFileName = "classes.jar"
+    jar.archiveFileName.set "classes.jar"
 
-    jar.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    jar.duplicatesStrategy DuplicatesStrategy.EXCLUDE
     jar.from {
         project.configurations.runtimeClasspath.collect { File file ->
             file.isDirectory() ? file : zipTree(file)
@@ -186,6 +186,8 @@ project.tasks.buildRelease { Jar jar ->
         project.ext.useandroid ? [project.zipTree(project.tasks.jar.archiveFile.get()), project.zipTree(dexFile)] :
                 [project.zipTree(project.tasks.jar.archiveFile.get())]
     }
+
+    jar.destinationDirectory.set project.file("artifacts")
 }
 
 // create dex jar

diff --git a/core/annotations/src/main/resources/classids.properties b/core/annotations/src/main/resources/classids.properties
diff --git a/core/annotations/src/main/resources/revisions/assault/0.json b/core/annotations/src/main/resources/revisions/assault/0.json
diff --git a/core/annotations/src/main/resources/revisions/bugFlyingSmall/0.json b/core/annotations/src/main/resources/revisions/bugFlyingSmall/0.json
diff --git a/core/annotations/src/main/resources/revisions/bugSmall/0.json b/core/annotations/src/main/resources/revisions/bugSmall/0.json
diff --git a/core/annotations/src/main/resources/revisions/general/0.json b/core/annotations/src/main/resources/revisions/general/0.json
diff --git a/core/annotations/src/main/resources/revisions/legion/0.json b/core/annotations/src/main/resources/revisions/legion/0.json
diff --git a/core/annotations/src/main/resources/revisions/legionnaire/0.json b/core/annotations/src/main/resources/revisions/legionnaire/0.json
diff --git a/core/annotations/src/main/resources/revisions/lord/0.json b/core/annotations/src/main/resources/revisions/lord/0.json
diff --git a/core/annotations/src/main/resources/revisions/lord/1.json b/core/annotations/src/main/resources/revisions/lord/1.json
diff --git a/core/annotations/src/main/resources/revisions/myriad/0.json b/core/annotations/src/main/resources/revisions/myriad/0.json
diff --git a/core/annotations/src/main/resources/revisions/radix/0.json b/core/annotations/src/main/resources/revisions/radix/0.json
diff --git a/core/annotations/src/main/resources/revisions/sergeant/0.json b/core/annotations/src/main/resources/revisions/sergeant/0.json
diff --git a/core/annotations/src/main/resources/revisions/sergeant/1.json b/core/annotations/src/main/resources/revisions/sergeant/1.json
diff --git a/core/annotations/src/main/resources/revisions/sergeant/2.json b/core/annotations/src/main/resources/revisions/sergeant/2.json
diff --git a/core/annotations/src/main/resources/revisions/smoke/0.json b/core/annotations/src/main/resources/revisions/smoke/0.json
diff --git a/core/annotations/src/main/resources/revisions/subSmall/0.json b/core/annotations/src/main/resources/revisions/subSmall/0.json
diff --git a/core/annotations/src/main/resources/revisions/testOverdrive/0.json b/core/annotations/src/main/resources/revisions/testOverdrive/0.json
diff --git a/core/annotations/src/main/resources/revisions/vulture/0.json b/core/annotations/src/main/resources/revisions/vulture/0.json
diff --git a/core/annotations/src/main/resources/revisions/warden/0.json b/core/annotations/src/main/resources/revisions/warden/0.json
diff --git a/core/build.gradle b/core/build.gradle
diff --git a/extensions/zelaux-entity-anno-comp/core.gradle b/extensions/zelaux-entity-anno-comp/core.gradle
@@ -1,4 +1,4 @@
-project.tasks.jar { Jar task ->
+project.tasks.compileJava { JavaCompile task ->
     task.doFirst {
         project.copy { CopySpec spec ->
             spec.from project.file("mod.json")

diff --git a/src/fos/core/FOSMod.java b/src/fos/core/FOSMod.java
@@ -11,8 +11,8 @@
 import arc.util.*;
 import fos.content.*;
 import fos.controllers.CapsulesController;
-import fos.gen.FosCall;
-import fos.gen.FosEntityMapping;
+import fos.gen.FOSCall;
+import fos.gen.FOSEntityMapping;
 import fos.graphics.*;
 import fos.net.FOSPackets;
 import fos.ui.*;
@@ -30,10 +30,12 @@
 import static arc.Core.settings;
 import static mindustry.Vars.headless;
 
-@ModAnnotations.RootDirectoryPath(rootDirectoryPath = "core")
+@ModAnnotations.RootDirectoryPath(rootDirectoryPath = "")
 @ModAnnotations.AnnotationSettings(
         rootPackage = "fos",
-        modInfoPath = "res/mod.json"
+        modInfoPath = "res/mod.json",
+        classPrefix = "FOS",
+        revisionsPath = "revisions"
 )
 public class FOSMod extends Mod {
     public FOSMod() {
@@ -42,8 +44,11 @@ public FOSMod() {
             Log.level = Log.LogLevel.debug;
 
         FOSPackets.register();
-        FosCall.registerPackets();
-        FosEntityMapping.init();
+        FOSCall.registerPackets();
+        FOSEntityMapping.init();
+        EntityMapping.nameMap.keys().toSeq().each(s -> {
+            EntityMapping.nameMap.put("fos-" + s, EntityMapping.nameMap.get(s));
+        });
 
         Events.on(EventType.ClientLoadEvent.class, e -> {
             clientLoaded();

diff --git a/src/fos/type/blocks/units/UpgradeCenter.java b/src/fos/type/blocks/units/UpgradeCenter.java
@@ -8,7 +8,7 @@
 import arc.struct.Seq;
 import arc.util.*;
 import arc.util.io.*;
-import fos.gen.FosCall;
+import fos.gen.FOSCall;
 import fos.gen.LumoniPlayerUnitc;
 import fos.net.FOSPackets;
 import fos.type.content.WeaponSet;
@@ -198,7 +198,7 @@ public void buildConfiguration(Table table) {
                 table.row();
                 table.button(Icon.units, Styles.clearTogglei, () -> {
                     if (weaponSet == null || Vars.player == null) return;
-                    FosCall.upgrade(Vars.player, tile());
+                    FOSCall.upgrade(Vars.player, tile());
                     deselect();
                 }).visible(() -> fraction() >= 1f);
             } else {