nerjal/antarchy-mirror
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 1.20 WIP port

Browse Source
This commit is contained in:
craisinlord committed 2026-08-03 22:15:18 -05:00
1 parent 58e504cf1d
commit 68a823d5ff
31 files changed
+559 -62
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common-1.21.1/src/main/java/com/craisinlord/antarchy/compat/infinity/InfinityCompatBridge.java
+4
View File
@@ -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
+10 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3
View File
@@ -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);
}
}
common-1.21.1/src/main/resources/assets/antarchy/animations/flying_squirrel.animation.json
+23 -23
View File
@@ -7,72 +7,72 @@
"bones": {
"left_leg": {
"rotation": {
"vector": ["5+math.cos(query.anim_time*90*2)*2", 0, -2.5]
"vector": ["5+math.cos(query.anim_time*2)*2", 0, -2.5]
},
"position": {
"vector": [0, "0.15+math.cos(query.anim_time*90*2)/14", "-math.cos(query.anim_time*90*2)/5"]
"vector": [0, "0.15+math.cos(query.anim_time*2)/14", "-math.cos(query.anim_time*2)/5"]
}
},
"right_leg": {
"rotation": {
"vector": ["5+math.cos(query.anim_time*90*2)*2", 0, 2.5]
"vector": ["5+math.cos(query.anim_time*2)*2", 0, 2.5]
},
"position": {
"vector": [0, "0.15+math.cos(query.anim_time*90*2)/14", "-math.cos(query.anim_time*90*2)/5"]
"vector": [0, "0.15+math.cos(query.anim_time*2)/14", "-math.cos(query.anim_time*2)/5"]
}
},
"torso": {
"rotation": {
"vector": ["-math.cos(query.anim_time*90*2-60)", 0, 0]
"vector": ["-math.cos(query.anim_time*2-60)", 0, 0]
},
"position": {
"vector": [0, "math.cos(query.anim_time*90*2)/5", 0]
"vector": [0, "math.cos(query.anim_time*2)/5", 0]
}
},
"head": {
"rotation": {
"vector": ["-math.cos(query.anim_time*90*2-160)*2", 0, 0]
"vector": ["-math.cos(query.anim_time*2-160)*2", 0, 0]
}
},
"left_ear": {
"rotation": {
"vector": ["math.cos(query.anim_time*90*2)*6", "math.cos(query.anim_time*90*2-40)*5", "7.5+math.cos(query.anim_time*90*2+30)*5"]
"vector": ["math.cos(query.anim_time*2)*6", "math.cos(query.anim_time*2-40)*5", "7.5+math.cos(query.anim_time*2+30)*5"]
}
},
"right_ear": {
"rotation": {
"vector": ["math.cos(query.anim_time*90*2)*6", "-math.cos(query.anim_time*90*2-40)*5", "-7.5-math.cos(query.anim_time*90*2+30)*5"]
"vector": ["math.cos(query.anim_time*2)*6", "-math.cos(query.anim_time*2-40)*5", "-7.5-math.cos(query.anim_time*2+30)*5"]
}
},
"tail": {
"rotation": {
"vector": ["math.cos(query.anim_time*90*2+50)*4", 0, 0]
"vector": ["math.cos(query.anim_time*2+50)*4", 0, 0]
}
},
"left_arm": {
"rotation": {
"vector": ["math.cos(query.anim_time*90*2-60)*3-3", 0, -5]
"vector": ["math.cos(query.anim_time*2-60)*3-3", 0, -5]
},
"position": {
"vector": [0, "-math.cos(query.anim_time*90*2-30)/4", "-math.cos(query.anim_time*90*2-50)/5"]
"vector": [0, "-math.cos(query.anim_time*2-30)/4", "-math.cos(query.anim_time*2-50)/5"]
}
},
"right_arm": {
"rotation": {
"vector": ["math.cos(query.anim_time*90*2-60)*3-3", 0, 5]
"vector": ["math.cos(query.anim_time*2-60)*3-3", 0, 5]
},
"position": {
"vector": [0, "-math.cos(query.anim_time*90*2-30)/4", "-math.cos(query.anim_time*90*2-50)/5"]
"vector": [0, "-math.cos(query.anim_time*2-30)/4", "-math.cos(query.anim_time*2-50)/5"]
}
},
"left_leg2": {
"rotation": {
"vector": ["-5-math.cos(query.anim_time*90*2)*2", 0, 2.5]
"vector": ["-5-math.cos(query.anim_time*2)*2", 0, 2.5]
}
},
"right_leg2": {
"rotation": {
"vector": ["-5-math.cos(query.anim_time*90*2)*2", 0, -2.5]
"vector": ["-5-math.cos(query.anim_time*2)*2", 0, -2.5]
}
}
}
@@ -1478,7 +1478,7 @@
"vector": [0, 0, 0]
},
"0.7917": {
"vector": ["-math.cos(query.anim_time*90*32-60)*20", "-math.cos(query.anim_time*90*32)*20", "math.cos(query.anim_time*90*32-50)*20"]
"vector": ["-math.cos(query.anim_time*32-60)*20", "-math.cos(query.anim_time*32)*20", "math.cos(query.anim_time*32-50)*20"]
},
"0.9167": {
"vector": [0, 0, 0]
@@ -1491,7 +1491,7 @@
"vector": [0, 0, 0]
},
"0.4583": {
"vector": ["-math.cos(query.anim_time*90*32-60)*20", "math.cos(query.anim_time*90*32)*20", "-math.cos(query.anim_time*90*32-50)*20"]
"vector": ["-math.cos(query.anim_time*32-60)*20", "math.cos(query.anim_time*32)*20", "-math.cos(query.anim_time*32-50)*20"]
},
"0.5833": {
"vector": [0, 0, 0]
@@ -1500,7 +1500,7 @@
"vector": [0, 0, 0]
},
"1.2917": {
"vector": ["-math.cos(query.anim_time*90*32-60)*20", "math.cos(query.anim_time*90*32)*20", "-math.cos(query.anim_time*90*32-50)*20"]
"vector": ["-math.cos(query.anim_time*32-60)*20", "math.cos(query.anim_time*32)*20", "-math.cos(query.anim_time*32-50)*20"]
},
"1.4167": {
"vector": [0, 0, 0]
@@ -1547,13 +1547,13 @@
},
"1.0": {
"post": {
"vector": [67.5, "-math.cos(query.anim_time*90*16)*10", "-17.5+math.cos(query.anim_time*90*16-60)*10"]
"vector": [67.5, "-math.cos(query.anim_time*16)*10", "-17.5+math.cos(query.anim_time*16-60)*10"]
},
"lerp_mode": "catmullrom"
},
"1.1667": {
"post": {
"vector": [67.5, "-math.cos(query.anim_time*90*16)*10", "-17.5+math.cos(query.anim_time*90*16-60)*10"]
"vector": [67.5, "-math.cos(query.anim_time*16)*10", "-17.5+math.cos(query.anim_time*16-60)*10"]
},
"lerp_mode": "catmullrom"
},
@@ -2145,13 +2145,13 @@
},
"0.5": {
"post": {
"vector": ["85-math.clamp(math.cos(query.anim_time*90*10-80)*10,0,10)", "math.cos(query.anim_time*90*8)*20", "math.cos(query.anim_time*90*8-80)*10"]
"vector": ["85-math.clamp(math.cos(query.anim_time*10-80)*10,0,10)", "math.cos(query.anim_time*8)*20", "math.cos(query.anim_time*8-80)*10"]
},
"lerp_mode": "catmullrom"
},
"1.0": {
"post": {
"vector": ["85-math.clamp(math.cos(query.anim_time*90*10-80)*10,0,10)", "math.cos(query.anim_time*90*8)*20", "math.cos(query.anim_time*90*8-80)*10"]
"vector": ["85-math.clamp(math.cos(query.anim_time*10-80)*10,0,10)", "math.cos(query.anim_time*8)*20", "math.cos(query.anim_time*8-80)*10"]
},
"lerp_mode": "catmullrom"
},
common-1.21.1/src/main/resources/assets/antarchy/animations/nightmare.animation.json
+5 -5
View File
@@ -7984,7 +7984,7 @@
},
"0.2917": {
"post": {
"vector": [0, "-1+math.cos(query.anim_time*90*32)*2", 6]
"vector": [0, "-1+math.cos(query.anim_time*32)*2", 6]
},
"lerp_mode": "catmullrom"
},
@@ -8014,7 +8014,7 @@
},
"0.7917": {
"post": {
"vector": [0, "-1+math.cos(query.anim_time*90*32)*2", 6]
"vector": [0, "-1+math.cos(query.anim_time*32)*2", 6]
},
"lerp_mode": "catmullrom"
},
@@ -8044,7 +8044,7 @@
},
"1.2917": {
"post": {
"vector": [0, "-1+math.cos(query.anim_time*90*32)*2", 6]
"vector": [0, "-1+math.cos(query.anim_time*32)*2", 6]
},
"lerp_mode": "catmullrom"
},
@@ -9176,13 +9176,13 @@
},
"1.6667": {
"post": {
"vector": ["35-math.cos(query.anim_time*90*32-50)*5", 0, 0]
"vector": ["35-math.cos(query.anim_time*32-50)*5", 0, 0]
},
"lerp_mode": "catmullrom"
},
"1.875": {
"post": {
"vector": ["35-math.cos(query.anim_time*90*32-50)*5", 0, 0]
"vector": ["35-math.cos(query.anim_time*32-50)*5", 0, 0]
},
"lerp_mode": "catmullrom"
},