2.2.5

add missing local jars to git

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/AlphaMantisEntity.java

@@ -46,6 +46,7 @@ public class AlphaMantisEntity extends MantisEntity {
     private static final double FORCED_RETURN_RADIUS = 144.0D;
     private static final int RESET_DELAY_TICKS = 300;
     private static final double HOME_RETURN_SPEED = 1.05D;
+    private static final int HOME_REPATH_INTERVAL_TICKS = 20;
 
     private final ServerBossEvent bossEvent =
             new com.craisinlord.antarchy.content.boss.EntityLinkedServerBossEvent(this.getUUID(), Component.translatable("entity.antarchy.alpha_mantis"), BossEvent.BossBarColor.GREEN, BossEvent.BossBarOverlay.PROGRESS);
@@ -53,6 +54,7 @@ public class AlphaMantisEntity extends MantisEntity {
     private int summonCooldownTicks;
     private int phaseTransitionTicks;
     private int disengageTicks;
+    private int homeRepathCooldown;
     private boolean halfHealthTransitionComplete;
     @Nullable
     private BlockPos encounterHome;
@@ -386,6 +388,7 @@ public class AlphaMantisEntity extends MantisEntity {
 
         if (target != null) {
             this.disengageTicks = 0;
+            this.homeRepathCooldown = 0;
             if (this.isOutsideLeashRadius()) {
                 this.resetEncounter(true);
             }
@@ -448,6 +451,11 @@ public class AlphaMantisEntity extends MantisEntity {
             return;
         }
         Vec3 homeCenter = Vec3.atCenterOf(this.encounterHome);
+        if (this.homeRepathCooldown > 0) {
+            this.homeRepathCooldown--;
+            return;
+        }
+        this.homeRepathCooldown = HOME_REPATH_INTERVAL_TICKS;
         if (this.distanceToSqr(homeCenter) > FORCED_RETURN_RADIUS * FORCED_RETURN_RADIUS) {
             this.moveTo(homeCenter.x, this.encounterHome.getY(), homeCenter.z, this.getYRot(), this.getXRot());
             this.setDeltaMovement(Vec3.ZERO);

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/EmperorScorpionEntity.java

@@ -105,6 +105,7 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity {
     private static final double FORCED_RETURN_RADIUS = 144.0D;
     private static final int RESET_DELAY_TICKS = 240;
     private static final double HOME_RETURN_SPEED = 1.0D;
+    private static final int HOME_REPATH_INTERVAL_TICKS = 20;
     private static final double NEARBY_SCORPION_CHECK_RADIUS = 32.0D;
 
     private static final ResourceKey<Level> THORAXIS_KEY =
@@ -137,6 +138,7 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity {
     private int hardenHealTicks;
     private int hardenSummonedScorpions;
     private int disengageTicks;
+    private int homeRepathCooldown;
     private boolean attackDamageApplied;
     private AttackType currentAttack = AttackType.NONE;
     private HardenPhase hardenPhase = HardenPhase.NONE;
@@ -797,6 +799,7 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity {
 
         if (target != null) {
             this.disengageTicks = 0;
+            this.homeRepathCooldown = 0;
             if (this.isOutsideLeashRadius()) {
                 this.resetEncounter(true);
             }
@@ -869,6 +872,11 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity {
             return;
         }
         Vec3 homeCenter = Vec3.atCenterOf(this.encounterHome);
+        if (this.homeRepathCooldown > 0) {
+            this.homeRepathCooldown--;
+            return;
+        }
+        this.homeRepathCooldown = HOME_REPATH_INTERVAL_TICKS;
         if (this.distanceToSqr(homeCenter) > FORCED_RETURN_RADIUS * FORCED_RETURN_RADIUS) {
             this.moveTo(homeCenter.x, homeCenter.y, homeCenter.z, this.getYRot(), this.getXRot());
             this.setDeltaMovement(Vec3.ZERO);

common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json

@@ -1662,5 +1662,9 @@
     "advancements.antarchy.survived_the_horde.description": "Survive a Cavaryn horde to its final wave and break it.",
     "advancements.antarchy.glimmer_keeper.title": "Glimmer Keeper",
     "advancements.antarchy.glimmer_keeper.description": "Tame every kind of Glimmer.",
-    "entity.antarchy.portal_gun_portal": "Portal Gun Portal"
+    "entity.antarchy.portal_gun_portal": "Portal Gun Portal",
+    "guide.antarchy.archive_folder.antlas": "Antlas",
+    "guide.antarchy.archive_folder.elythia": "Elythia",
+    "guide.antarchy.archive_folder.cavaryn": "Cavaryn",
+    "guide.antarchy.archive_folder.thoraxis": "Thoraxis"
 }

common-1.21.1/src/main/resources/data/antarchy/computer/archive_folder/antlas.json

@@ -0,0 +1,6 @@
+{
+  "title": "guide.antarchy.archive_folder.antlas",
+  "icon_item": "antarchy:portal_gun_atlas",
+  "sort_order": 10,
+  "green_tint": false
+}

common-1.21.1/src/main/resources/data/antarchy/computer/archive_folder/cavaryn.json

@@ -0,0 +1,7 @@
+{
+  "title": "guide.antarchy.archive_folder.cavaryn",
+  "icon_item": "antarchy:termite_spawn_egg",
+  "parent": "antarchy:antlas",
+  "sort_order": 20,
+  "green_tint": false
+}

common-1.21.1/src/main/resources/data/antarchy/computer/archive_folder/elythia.json

@@ -0,0 +1,7 @@
+{
+  "title": "guide.antarchy.archive_folder.elythia",
+  "icon_item": "antarchy:brown_ant_spawn_egg",
+  "parent": "antarchy:antlas",
+  "sort_order": 10,
+  "green_tint": false
+}

common-1.21.1/src/main/resources/data/antarchy/computer/archive_folder/thoraxis.json

@@ -0,0 +1,7 @@
+{
+  "title": "guide.antarchy.archive_folder.thoraxis",
+  "icon_item": "antarchy:red_ant_spawn_egg",
+  "parent": "antarchy:antlas",
+  "sort_order": 30,
+  "green_tint": false
+}

common-1.21.1/src/main/resources/data/antarchy/computer/entry/bloodglass.json

@@ -1,6 +1,8 @@
 {
   "type": "article",
   "category": "thoraxis",
+  "folder": "antarchy:thoraxis",
+  "sort_order": 20,
   "title": "guide.antarchy.entry.bloodglass.title",
   "subtitle": "guide.antarchy.entry.bloodglass.subtitle",
   "description": ["guide.antarchy.entry.bloodglass.description", "guide.antarchy.entry.bloodglass.description2", "guide.antarchy.entry.bloodglass.description3"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/brown_ant.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "elythia",
+  "folder": "antarchy:elythia",
+  "sort_order": 0,
   "title": "guide.antarchy.entry.brown_ant.title",
   "subtitle": "guide.antarchy.entry.brown_ant.subtitle",
   "description": ["guide.antarchy.entry.brown_ant.description", "guide.antarchy.entry.brown_ant.description2", "guide.antarchy.entry.brown_ant.description3"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/brutalfly.json

@@ -1,6 +1,8 @@
 {
   "type": "mob",
   "category": "elythia",
+  "folder": "antarchy:elythia",
+  "sort_order": 30,
   "title": "guide.antarchy.entry.brutalfly.title",
   "subtitle": "guide.antarchy.entry.brutalfly.subtitle",
   "description": ["guide.antarchy.entry.brutalfly.description", "guide.antarchy.entry.brutalfly.description2", "guide.antarchy.entry.brutalfly.description3", "guide.antarchy.entry.brutalfly.description4"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/duplicator_tree.json

@@ -1,6 +1,8 @@
 {
   "type": "article",
   "category": "general",
+  "folder": "antarchy:antlas",
+  "sort_order": 40,
   "title": "guide.antarchy.entry.duplicator_tree.title",
   "subtitle": "guide.antarchy.entry.duplicator_tree.subtitle",
   "description": ["guide.antarchy.entry.duplicator_tree.description", "guide.antarchy.entry.duplicator_tree.description2"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/easter_bunny.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "general",
+  "folder": "antarchy:antlas",
+  "sort_order": 30,
   "title": "guide.antarchy.entry.easter_bunny.title",
   "subtitle": "guide.antarchy.entry.easter_bunny.subtitle",
   "description": ["guide.antarchy.entry.easter_bunny.description", "guide.antarchy.entry.easter_bunny.description2"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/flying_squirrel.json

@@ -1,6 +1,8 @@
 {
   "type": "mob",
   "category": "elythia",
+  "folder": "antarchy:elythia",
+  "sort_order": 10,
   "title": "guide.antarchy.entry.flying_squirrel.title",
   "subtitle": "guide.antarchy.entry.flying_squirrel.subtitle",
   "description": ["guide.antarchy.entry.flying_squirrel.description", "guide.antarchy.entry.flying_squirrel.description2", "guide.antarchy.entry.flying_squirrel.description3", "guide.antarchy.entry.flying_squirrel.description4"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/glimmer.json

@@ -1,6 +1,8 @@
 {
   "type": "mob",
   "category": "elythia",
+  "folder": "antarchy:elythia",
+  "sort_order": 20,
   "title": "guide.antarchy.entry.glimmer.title",
   "subtitle": "guide.antarchy.entry.glimmer.subtitle",
   "description": ["guide.antarchy.entry.glimmer.description", "guide.antarchy.entry.glimmer.description2", "guide.antarchy.entry.glimmer.description3", "guide.antarchy.entry.glimmer.description4", "guide.antarchy.entry.glimmer.description5", "guide.antarchy.entry.glimmer.description6", "guide.antarchy.entry.glimmer.description7"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/hercules_beetle.json

@@ -1,6 +1,8 @@
 {
   "type": "mob",
   "category": "cavaryn",
+  "folder": "antarchy:cavaryn",
+  "sort_order": 10,
   "title": "guide.antarchy.entry.hercules_beetle.title",
   "subtitle": "guide.antarchy.entry.hercules_beetle.subtitle",
   "description": ["guide.antarchy.entry.hercules_beetle.description", "guide.antarchy.entry.hercules_beetle.description2", "guide.antarchy.entry.hercules_beetle.description3"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/high_fructose_corn_syrup.json

@@ -1,6 +1,8 @@
 {
   "type": "article",
   "category": "general",
+  "folder": "antarchy:antlas",
+  "sort_order": 20,
   "title": "guide.antarchy.entry.high_fructose_corn_syrup.title",
   "subtitle": "guide.antarchy.entry.high_fructose_corn_syrup.subtitle",
   "description": ["guide.antarchy.entry.high_fructose_corn_syrup.description", "guide.antarchy.entry.high_fructose_corn_syrup.description2", "guide.antarchy.entry.high_fructose_corn_syrup.description3"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/king.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "elythia",
+  "folder": "antarchy:elythia",
+  "sort_order": 50,
   "title": "guide.antarchy.entry.king.title",
   "subtitle": "guide.antarchy.entry.king.subtitle",
   "description": [

common-1.21.1/src/main/resources/data/antarchy/computer/entry/kraken.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "general",
+  "folder": "antarchy:antlas",
+  "sort_order": 10,
   "title": "guide.antarchy.entry.kraken.title",
   "subtitle": "guide.antarchy.entry.kraken.subtitle",
   "description": [

common-1.21.1/src/main/resources/data/antarchy/computer/entry/nightmare.json

@@ -1,6 +1,8 @@
 {
   "type": "mob",
   "category": "thoraxis",
+  "folder": "antarchy:thoraxis",
+  "sort_order": 10,
   "title": "guide.antarchy.entry.nightmare.title",
   "subtitle": "guide.antarchy.entry.nightmare.subtitle",
   "description": ["guide.antarchy.entry.nightmare.description", "guide.antarchy.entry.nightmare.description2", "guide.antarchy.entry.nightmare.description3"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/prince.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "elythia",
+  "folder": "antarchy:elythia",
+  "sort_order": 40,
   "title": "guide.antarchy.entry.prince.title",
   "subtitle": "guide.antarchy.entry.prince.subtitle",
   "description": ["guide.antarchy.entry.prince.description", "guide.antarchy.entry.prince.description2"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/princess.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "thoraxis",
+  "folder": "antarchy:thoraxis",
+  "sort_order": 50,
   "title": "guide.antarchy.entry.princess.title",
   "subtitle": "guide.antarchy.entry.princess.subtitle",
   "description": ["guide.antarchy.entry.princess.description", "guide.antarchy.entry.princess.description2"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/queen.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "thoraxis",
+  "folder": "antarchy:thoraxis",
+  "sort_order": 60,
   "title": "guide.antarchy.entry.queen.title",
   "subtitle": "guide.antarchy.entry.queen.subtitle",
   "description": [

common-1.21.1/src/main/resources/data/antarchy/computer/entry/rainbow_ant.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "general",
+  "folder": "antarchy:antlas",
+  "sort_order": 0,
   "title": "guide.antarchy.entry.rainbow_ant.title",
   "subtitle": "guide.antarchy.entry.rainbow_ant.subtitle",
   "description": [

common-1.21.1/src/main/resources/data/antarchy/computer/entry/red_ant.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "thoraxis",
+  "folder": "antarchy:thoraxis",
+  "sort_order": 0,
   "title": "guide.antarchy.entry.red_ant.title",
   "subtitle": "guide.antarchy.entry.red_ant.subtitle",
   "description": [

common-1.21.1/src/main/resources/data/antarchy/computer/entry/temporal_fields.json

@@ -1,6 +1,8 @@
 {
   "type": "article",
   "category": "thoraxis",
+  "folder": "antarchy:thoraxis",
+  "sort_order": 30,
   "title": "guide.antarchy.entry.temporal_fields.title",
   "subtitle": "guide.antarchy.entry.temporal_fields.subtitle",
   "description": ["guide.antarchy.entry.temporal_fields.description", "guide.antarchy.entry.temporal_fields.description2", "guide.antarchy.entry.temporal_fields.description3"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/termite.json

@@ -1,6 +1,8 @@
 {
   "type": "entity",
   "category": "cavaryn",
+  "folder": "antarchy:cavaryn",
+  "sort_order": 0,
   "title": "guide.antarchy.entry.termite.title",
   "subtitle": "guide.antarchy.entry.termite.subtitle",
   "description": ["guide.antarchy.entry.termite.description", "guide.antarchy.entry.termite.description2", "guide.antarchy.entry.termite.description3", "guide.antarchy.entry.termite.description4"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/toreterror_arena.json

@@ -1,6 +1,8 @@
 {
   "type": "structure",
   "category": "elythia",
+  "folder": "antarchy:elythia",
+  "sort_order": 60,
   "title": "guide.antarchy.entry.toreterror.title",
   "subtitle": "guide.antarchy.entry.toreterror_arena.subtitle",
   "description": ["guide.antarchy.entry.toreterror_arena.description", "guide.antarchy.entry.toreterror_arena.description2"],

common-1.21.1/src/main/resources/data/antarchy/computer/entry/vortex.json

@@ -1,6 +1,8 @@
 {
   "type": "article",
   "category": "thoraxis",
+  "folder": "antarchy:thoraxis",
+  "sort_order": 40,
   "title": "guide.antarchy.entry.vortex.title",
   "subtitle": "guide.antarchy.entry.vortex.subtitle",
   "description": ["guide.antarchy.entry.vortex.description", "guide.antarchy.entry.vortex.description2", "guide.antarchy.entry.vortex.description3"],