update 1.20 WIP port

common-1.21.1/src/main/java/com/craisinlord/antarchy/compat/infinity/InfinityCompatBridge.java

@@ -16,6 +16,10 @@ public interface InfinityCompatBridge {
         return null;
     }
 
+    default ResourceLocation getRandomDimensionId(RandomSource random, double easterEggChance) {
+        return getRandomDimensionId(random);
+    }
+
     default boolean requestWarp(ServerPlayer player, ResourceLocation dimensionId) {
         return false;
     }

common-1.21.1/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java

@@ -9,6 +9,7 @@ public final class AntarchySettings {
     private static boolean easterBunnyEnabled = true;
     private static int easterBunnyNaturalSpawnChancePercent = 1;
     private static boolean rainbowAntsLeadToInfinityDimensions = true;
+    private static double rainbowAntInfinityEasterEggChance = 0.01D;
     private static boolean brownAntRequiresReagent = false;
     private static boolean brownAntRightClickDimension = true;
     private static boolean redAntRequiresReagent = false;
@@ -316,7 +317,7 @@ public final class AntarchySettings {
     private static double krakenArmor = 8.0D;
     private static double krakenProjectileDamageTakenMultiplier = 0.5D;
     private static double krakenBossBarRange = 40.0D;
-    private static float krakenLightningDamagePhaseOne = 8.0F;
+    private static float krakenLightningDamagePhaseOne = 6.0F;
     private static double lucidHealth = 30.0D;
     private static double lucidAttackDamage = 4.0D;
     private static double lucidMovementSpeed = 0.22D;
@@ -465,6 +466,10 @@ public final class AntarchySettings {
         return rainbowAntsLeadToInfinityDimensions;
     }
 
+    public static double rainbowAntInfinityEasterEggChance() {
+        return rainbowAntInfinityEasterEggChance;
+    }
+
     public static boolean brownAntRightClickDimension() {
         return brownAntRightClickDimension;
     }
@@ -1004,6 +1009,10 @@ public final class AntarchySettings {
         rainbowAntsLeadToInfinityDimensions = value;
     }
 
+    public static void setRainbowAntInfinityEasterEggChance(double value) {
+        rainbowAntInfinityEasterEggChance = value;
+    }
+
     public static void setBrownAntRightClickDimension(boolean value) {
         brownAntRightClickDimension = value;
     }

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

@@ -291,7 +291,7 @@ public class RainbowAntEntity extends BaseAntEntity implements GeoEntity {
     }
 
     private String createRandomDimensionId() {
-        ResourceLocation dimensionId = InfinityCompat.get().getRandomDimensionId(this.random);
+        ResourceLocation dimensionId = InfinityCompat.get().getRandomDimensionId(this.random, AntarchySettings.rainbowAntInfinityEasterEggChance());
         if (dimensionId == null) {
             return "";
         }

common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/ultimate/UltimateCrossbowItem.java

@@ -125,6 +125,9 @@ public class UltimateCrossbowItem extends CrossbowItem {
         super.shootProjectile(shooter, projectile, projectileIndex, velocity, inaccuracy, angle, target);
         if (projectile instanceof AbstractArrow arrow) {
             scaleArrowDamage(arrow);
+            if (projectileIndex > 0) {
+                arrow.pickup = AbstractArrow.Pickup.DISALLOWED;
+            }
             UltimateGearHelper.tagUltimateCrossbowProjectile(arrow);
         }
     }