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

2.2.9

Browse Source
This commit is contained in:
craisinlord committed 2026-10-25 13:24:58 -05:00
1 parent 3700359dfb
commit 5a8cb58cb0
74 files changed
+2408 -530
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/config/AntarchySettings.java
+4
View File
@@ -302,6 +302,7 @@ public final class AntarchySettings {
private static double royalBossKnockbackResistance = 1.0D;
private static double royalBossStepHeight = 3.0D;
private static double royalBossMaxSingleHitDamage = 250.0D;
private static double royalBossHitOverflowRate = 0.25D;
private static double royalBossBiteReach = 12.0D;
private static double royalBossBiteDamageMultiplier = 1.6D;
private static int royalBossBiteCooldownTicks = 45;
@@ -2257,6 +2258,9 @@ public final class AntarchySettings {
public static double royalBossMaxSingleHitDamage() { return royalBossMaxSingleHitDamage; }
public static void setRoyalBossMaxSingleHitDamage(double v) { royalBossMaxSingleHitDamage = v; }
public static double royalBossHitOverflowRate() { return royalBossHitOverflowRate; }
public static void setRoyalBossHitOverflowRate(double v) { royalBossHitOverflowRate = v; }
public static double royalBossBiteReach() { return royalBossBiteReach; }
public static void setRoyalBossBiteReach(double v) { royalBossBiteReach = v; }
common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/BloodglassWardEffect.java
+1 -1
View File
@@ -21,7 +21,7 @@ public final class BloodglassWardEffect extends MobEffect {
public void addAttributeModifiers(AttributeMap attributeMap, int amplifier) {
AttributeInstance instance = attributeMap.getInstance(AntarchyObjects.BLOODGLASS_MAX_HEARTS.get());
if (instance == null) return;
instance.addTransientModifier(
instance.addOrUpdateTransientModifier(
new AttributeModifier(MODIFIER_ID, amplifier + 1, AttributeModifier.Operation.ADD_VALUE)
);
}
common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/GrowthMobEffect.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class GrowthMobEffect extends MobEffect {
AttributeInstance instance = attributeMap.getInstance(Attributes.SCALE);
if (instance == null) return;
double amount = AntarchySettings.growthPotionDelta() * (amplifier + 1);
instance.addTransientModifier(
instance.addOrUpdateTransientModifier(
new AttributeModifier(MODIFIER_ID, amount, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL)
);
}
common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/RoyalVitalityPenaltyEffect.java
+1 -1
View File
@@ -21,7 +21,7 @@ public final class RoyalVitalityPenaltyEffect extends MobEffect {
public void addAttributeModifiers(AttributeMap attributeMap, int amplifier) {
AttributeInstance maxHealth = attributeMap.getInstance(Attributes.MAX_HEALTH);
if (maxHealth == null) return;
maxHealth.addTransientModifier(new AttributeModifier(
maxHealth.addOrUpdateTransientModifier(new AttributeModifier(
MODIFIER_ID, -0.5D, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL));
}
common-1.21.1/src/main/java/com/craisinlord/antarchy/content/effect/ShrinkMobEffect.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class ShrinkMobEffect extends MobEffect {
AttributeInstance instance = attributeMap.getInstance(Attributes.SCALE);
if (instance == null) return;
double amount = -(AntarchySettings.shrinkingPotionDelta() * (amplifier + 1));
instance.addTransientModifier(
instance.addOrUpdateTransientModifier(
new AttributeModifier(MODIFIER_ID, amount, AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL)
);
}
common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBossEntity.java
+2 -1
View File
@@ -2009,7 +2009,8 @@ public abstract class RoyalBossEntity extends Monster implements GeoEntity, Mult
if (source.is(DamageTypes.GENERIC_KILL)) {
return super.hurt(source, amount);
}
float cappedAmount = (float) Math.min(amount, AntarchySettings.royalBossMaxSingleHitDamage());
float cap = (float) AntarchySettings.royalBossMaxSingleHitDamage();
float cappedAmount = amount <= cap ? amount : cap + (amount - cap) * (float) AntarchySettings.royalBossHitOverflowRate();
return super.hurt(source, cappedAmount);
}
common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/ants/TermiteNestFeature.java
+2 -1
View File
@@ -34,7 +34,8 @@ public class TermiteNestFeature extends SurfaceAntNestFeature {
protected BlockPos resolveNestPos(WorldGenLevel level, BlockPos origin) {
int x = origin.getX();
int z = origin.getZ();
int startY = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z) - 1;
// Start from the placement height so roofed dimensions like Cavaryn get nests on every cave layer, not just the top one.
int startY = Math.min(origin.getY(), level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z) - 1);
int minY = level.getMinBuildHeight() + 1;
for (int y = startY; y >= minY; y--) {
common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/apple_cow.json
+28 -6
View File
@@ -48,13 +48,35 @@
"function": "minecraft:furnace_smelt",
"conditions": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "direct_attacker",
"predicate": {
"equipment": {
"mainhand": {
"predicates": {
"minecraft:enchantments": [
{
"enchantments": "#minecraft:smelts_loot"
}
]
}
}
}
}
}
}
]
}
]
},
common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/enchanted_golden_apple_cow.json
+28 -6
View File
@@ -48,13 +48,35 @@
"function": "minecraft:furnace_smelt",
"conditions": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "direct_attacker",
"predicate": {
"equipment": {
"mainhand": {
"predicates": {
"minecraft:enchantments": [
{
"enchantments": "#minecraft:smelts_loot"
}
]
}
}
}
}
}
}
]
}
]
},
common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/golden_apple_cow.json
+28 -6
View File
@@ -48,13 +48,35 @@
"function": "minecraft:furnace_smelt",
"conditions": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "direct_attacker",
"predicate": {
"equipment": {
"mainhand": {
"predicates": {
"minecraft:enchantments": [
{
"enchantments": "#minecraft:smelts_loot"
}
]
}
}
}
}
}
}
]
}
]
},
common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/ouranwood_deer.json
+28 -6
View File
@@ -48,13 +48,35 @@
"function": "minecraft:furnace_smelt",
"conditions": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_on_fire": true
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "direct_attacker",
"predicate": {
"equipment": {
"mainhand": {
"predicates": {
"minecraft:enchantments": [
{
"enchantments": "#minecraft:smelts_loot"
}
]
}
}
}
}
}
}
]
}
]
},
common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/cavaryn_moleworm_caves.json
+2 -1
View File
@@ -55,7 +55,8 @@
],
[
"antarchy:moleworm_caves_creepvine",
"antarchy:moleworm_caves_hanging_creeproots"
"antarchy:moleworm_caves_hanging_creeproots",
"antarchy:termite_nest"
],
[]
],
common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/wormy_caves.json
+2 -1
View File
@@ -52,7 +52,8 @@
"antarchy:wormy_caves_creepvine",
"antarchy:wormy_caves_hanging_creeproots",
"antarchy:wormy_caves_molting_vines",
"antarchy:wormy_caves_ground_molting_vines"
"antarchy:wormy_caves_ground_molting_vines",
"antarchy:termite_nest"
],
[]
],
common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/red_ant_nest.json
+1 -1
View File
@@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 24
"chance": 8
},
{
"type": "minecraft:in_square"
common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/red_ant_nest_magma.json
+1 -1
View File
@@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 24
"chance": 8
},
{
"type": "minecraft:in_square"
common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest.json
+11 -3
View File
@@ -3,14 +3,22 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 88
"chance": 24
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
"type": "minecraft:height_range",
"height": {
"type": "minecraft:uniform",
"min_inclusive": {
"absolute": 8
},
"max_inclusive": {
"absolute": 190
}
}
},
{
"type": "minecraft:biome"
common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/termite_nest_cavaryn.json
+11 -3
View File
@@ -3,14 +3,22 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 44
"chance": 16
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
"type": "minecraft:height_range",
"height": {
"type": "minecraft:uniform",
"min_inclusive": {
"absolute": 8
},
"max_inclusive": {
"absolute": 190
}
}
},
{
"type": "minecraft:biome"