2.2.5

add missing local jars to git
2026-10-17 14:41:03 -05:00
1 parent 770b5a607e
commit 758fa58b1b
@@ -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;
@@ -385,6 +387,7 @@ public class AlphaMantisEntity extends MantisEntity {

        if (target != null) {
            this.disengageTicks = 0;
+            this.homeRepathCooldown = 0;
            if (this.isOutsideLeashRadius()) {
                this.resetEncounter(true);
            }
@@ -447,6 +450,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);
@@ -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;
@@ -798,6 +800,7 @@ public class EmperorScorpionEntity extends Monster implements GeoEntity {

        if (target != null) {
            this.disengageTicks = 0;
+            this.homeRepathCooldown = 0;
            if (this.isOutsideLeashRadius()) {
                this.resetEncounter(true);
            }
@@ -870,6 +873,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);
@@ -1669,5 +1669,9 @@
    "item.antarchy.music_disc_the_queen.desc": "Karlljp - The Queen",
    "item.antarchy.music_disc_verdance.desc": "Hewo - Verdance",
    "item.antarchy.music_disc_grotesque.desc": "DocShrekBot - Grotesque",
-    "attribute.antarchy.entity_interaction_range": "Entity Interaction Range"
+    "attribute.antarchy.entity_interaction_range": "Entity Interaction Range",
+    "guide.antarchy.archive_folder.antlas": "Antlas",
+    "guide.antarchy.archive_folder.elythia": "Elythia",
+    "guide.antarchy.archive_folder.cavaryn": "Cavaryn",
+    "guide.antarchy.archive_folder.thoraxis": "Thoraxis"
 }
@@ -0,0 +1,6 @@
+{
+  "title": "guide.antarchy.archive_folder.antlas",
+  "icon_item": "antarchy:portal_gun_atlas",
+  "sort_order": 10,
+  "green_tint": false
+}
@@ -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
+}
@@ -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
+}
@@ -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
+}
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [
@@ -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": [