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

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@ mod_name=Antarchy
mod_description=ANTS! ANTS! ANTS! ANTS!
mod_authors=CraisinLord
mod_group_id=com.craisinlord
mod_version=2.2.7
mod_version=2.2.9
mod_license=All Rights Reserved
minecraft_version=1.20.1
@@ -154,6 +154,7 @@ public final class AntarchyConfigModuleForge {
AntarchySettings.setRoyalBossKnockbackResistance(AntarchyMobsConfig.royalBossKnockbackResistance());
AntarchySettings.setRoyalBossStepHeight(AntarchyMobsConfig.royalBossStepHeight());
AntarchySettings.setRoyalBossMaxSingleHitDamage(AntarchyMobsConfig.royalBossMaxSingleHitDamage());
AntarchySettings.setRoyalBossHitOverflowRate(AntarchyMobsConfig.royalBossHitOverflowRate());
AntarchySettings.setRoyalBossBiteReach(AntarchyMobsConfig.royalBossBiteReach());
AntarchySettings.setRoyalBossBiteDamageMultiplier(AntarchyMobsConfig.royalBossBiteDamageMultiplier());
AntarchySettings.setRoyalBossBiteCooldownTicks(AntarchyMobsConfig.royalBossBiteCooldownTicks());
@@ -439,6 +440,9 @@ public final class AntarchyConfigModuleForge {
AntarchySettings.setUltimateHoeAttackSpeed(AntarchyToolsConfig.ultimateHoeAttackSpeed());
AntarchySettings.setUltimateToolEnchantability(AntarchyToolsConfig.ultimateToolEnchantability());
AntarchySettings.setUltimateToolsThreeByThreeEnabled(AntarchyToolsConfig.ultimateToolsThreeByThreeEnabled());
AntarchySettings.setUltimateToolsVeinMiningEnabled(AntarchyToolsConfig.ultimateToolsVeinMiningEnabled());
AntarchySettings.setUltimateToolsVeinMiningMaxBlocks(AntarchyToolsConfig.ultimateToolsVeinMiningMaxBlocks());
AntarchySettings.setUltimateToolsTreeFellingMaxLogs(AntarchyToolsConfig.ultimateToolsTreeFellingMaxLogs());
AntarchySettings.setUltimateBowAttackDamage(AntarchyToolsConfig.ultimateBowAttackDamage());
AntarchySettings.setUltimateBowPlayerHeal(AntarchyToolsConfig.ultimateBowPlayerHeal());
@@ -104,6 +104,7 @@ public final class AntarchyMobsConfig {
private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_KNOCKBACK_RESISTANCE;
private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_STEP_HEIGHT;
private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE;
private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_HIT_OVERFLOW_RATE;
private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_BITE_REACH;
private static final ForgeConfigSpec.DoubleValue ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER;
private static final ForgeConfigSpec.IntValue ROYAL_BOSS_BITE_COOLDOWN_TICKS;
@@ -531,6 +532,7 @@ public final class AntarchyMobsConfig {
ROYAL_BOSS_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance shared by King and Queen.").defineInRange("knockbackResistance", 1.0D, 0.0D, 1.0D);
ROYAL_BOSS_STEP_HEIGHT = b.comment("Base step height shared by King and Queen.").defineInRange("stepHeight", 3.0D, 0.0D, 32.0D);
ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE = b.comment("Maximum damage a single hit can deal to a Royal boss before later anti-burst systems are added.").defineInRange("maxSingleHitDamage", 250.0D, 1.0D, 32768.0D);
ROYAL_BOSS_HIT_OVERFLOW_RATE = b.comment("Share of damage above maxSingleHitDamage that still lands. 0 makes the cap a hard limit.").defineInRange("hitOverflowRate", 0.25D, 0.0D, 1.0D);
ROYAL_BOSS_BITE_REACH = b.comment("Radius around each head anchor that a King or Queen bite can hit.").defineInRange("biteReach", 12.0D, 1.0D, 64.0D);
ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER = b.comment("Multiplier applied to base attack damage for King and Queen head bites.").defineInRange("biteDamageMultiplier", 1.6D, 0.0D, 32.0D);
ROYAL_BOSS_BITE_COOLDOWN_TICKS = b.comment("Base cooldown in ticks between bites for a single King or Queen head (scaled down at later phases).").defineInRange("biteCooldownTicks", 45, 1, 1200);
@@ -1046,6 +1048,7 @@ public final class AntarchyMobsConfig {
static double royalBossKnockbackResistance() { return ROYAL_BOSS_KNOCKBACK_RESISTANCE.get(); }
static double royalBossStepHeight() { return ROYAL_BOSS_STEP_HEIGHT.get(); }
static double royalBossMaxSingleHitDamage() { return ROYAL_BOSS_MAX_SINGLE_HIT_DAMAGE.get(); }
static double royalBossHitOverflowRate() { return ROYAL_BOSS_HIT_OVERFLOW_RATE.get(); }
static double royalBossBiteReach() { return ROYAL_BOSS_BITE_REACH.get(); }
static double royalBossBiteDamageMultiplier() { return ROYAL_BOSS_BITE_DAMAGE_MULTIPLIER.get(); }
static int royalBossBiteCooldownTicks() { return ROYAL_BOSS_BITE_COOLDOWN_TICKS.get(); }
@@ -22,6 +22,9 @@ public final class AntarchyToolsConfig {
private static final ForgeConfigSpec.DoubleValue ULTIMATE_HOE_ATTACK_SPEED;
private static final ForgeConfigSpec.IntValue ULTIMATE_TOOL_ENCHANTABILITY;
private static final ForgeConfigSpec.BooleanValue ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED;
private static final ForgeConfigSpec.BooleanValue ULTIMATE_TOOLS_VEIN_MINING_ENABLED;
private static final ForgeConfigSpec.IntValue ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS;
private static final ForgeConfigSpec.IntValue ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS;
private static final ForgeConfigSpec.DoubleValue ULTIMATE_BOW_ATTACK_DAMAGE;
private static final ForgeConfigSpec.DoubleValue ULTIMATE_BOW_PLAYER_HEAL;
@@ -248,6 +251,11 @@ public final class AntarchyToolsConfig {
ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED = b
.comment("If false, Ultimate pickaxe, axe, shovel, and hoe lose their 3x3 mining mode and tooltip.")
.define("threeByThreeEnabled", true);
ULTIMATE_TOOLS_VEIN_MINING_ENABLED = b
.comment("If false, the Ultimate Pickaxe and Axe lose Vein Mining and the Battle Axe stops felling trees.")
.define("veinMiningEnabled", true);
ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS = b.comment("Most extra blocks the Ultimate Pickaxe or Axe breaks in one Vein Mining swing. Logs use treeFellingMaxLogs instead.").defineInRange("veinMiningMaxBlocks", 64, 1, 1024);
ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS = b.comment("Most extra logs broken at once by Vein Mining on logs or by the Battle Axe.") .defineInRange("treeFellingMaxLogs", 128, 1, 1024);
b.pop();
b.push("ultimateBow");
@@ -574,6 +582,9 @@ public final class AntarchyToolsConfig {
static double ultimateHoeAttackSpeed() { return ULTIMATE_HOE_ATTACK_SPEED.get(); }
static int ultimateToolEnchantability() { return ULTIMATE_TOOL_ENCHANTABILITY.get(); }
static boolean ultimateToolsThreeByThreeEnabled() { return ULTIMATE_TOOLS_THREE_BY_THREE_ENABLED.get(); }
static boolean ultimateToolsVeinMiningEnabled() { return ULTIMATE_TOOLS_VEIN_MINING_ENABLED.get(); }
static int ultimateToolsVeinMiningMaxBlocks() { return ULTIMATE_TOOLS_VEIN_MINING_MAX_BLOCKS.get(); }
static int ultimateToolsTreeFellingMaxLogs() { return ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS.get(); }
static double ultimateBowAttackDamage() { return ULTIMATE_BOW_ATTACK_DAMAGE.get(); }
static double ultimateBowPlayerHeal() { return ULTIMATE_BOW_PLAYER_HEAL.get(); }
@@ -36,6 +36,21 @@ public final class AntarchyKeyBindings {
InputConstants.KEY_R,
CATEGORY
);
public static final KeyMapping MOUNT_BEAM = new KeyMapping(
"key.antarchy.mount_beam",
KeyConflictContext.IN_GAME,
InputConstants.Type.KEYSYM,
InputConstants.KEY_H,
CATEGORY
);
public static final KeyMapping MOUNT_SIGNATURE = new KeyMapping(
"key.antarchy.mount_signature",
KeyConflictContext.IN_GAME,
InputConstants.Type.KEYSYM,
InputConstants.KEY_J,
CATEGORY
);
public static final KeyMapping TIGERS_EYE_CAMOUFLAGE = new KeyMapping(
"key.antarchy.tigers_eye_camouflage",
KeyConflictContext.IN_GAME,
@@ -80,6 +95,8 @@ public final class AntarchyKeyBindings {
event.register(BRUTALFLY_FLAP);
event.register(MOUNT_SPECIAL);
event.register(MOUNT_FLIGHT_TOGGLE);
event.register(MOUNT_BEAM);
event.register(MOUNT_SIGNATURE);
event.register(TIGERS_EYE_CAMOUFLAGE);
event.register(ROYAL_INVERSION_TOGGLE);
event.register(ROYAL_BOUNDARY);
@@ -91,6 +108,14 @@ public final class AntarchyKeyBindings {
return MOUNT_FLIGHT_TOGGLE.isDown();
}
public static boolean isMountBeamPressed() {
return MOUNT_BEAM.isDown();
}
public static boolean isMountSignaturePressed() {
return MOUNT_SIGNATURE.isDown();
}
public static boolean isMountSpecialPressed() {
return MOUNT_SPECIAL.isDown();
}
@@ -18,6 +18,8 @@ public final class RoyalMountClientHandler {
private static boolean wasAttack;
private static boolean wasSpecial;
private static boolean wasFlightToggle;
private static boolean wasBeam;
private static boolean wasSignature;
private static boolean wasAscend;
private static boolean wasDescend;
private static boolean wasUse;
@@ -65,6 +67,18 @@ public final class RoyalMountClientHandler {
}
wasFlightToggle = flightToggle;
boolean beam = AntarchyKeyBindings.isMountBeamPressed();
if (beam && !wasBeam) {
AntarchyForgeNetworkCore.sendToServer(new RoyalMountActionPayload(RoyalMountActionPayload.BEAM));
}
wasBeam = beam;
boolean signature = AntarchyKeyBindings.isMountSignaturePressed();
if (signature && !wasSignature) {
AntarchyForgeNetworkCore.sendToServer(new RoyalMountActionPayload(RoyalMountActionPayload.SIGNATURE));
}
wasSignature = signature;
boolean ascend = mc.options.keyJump.isDown();
boolean descend = mc.options.keyShift.isDown();
if (ascend != wasAscend || descend != wasDescend) {
@@ -81,6 +95,8 @@ public final class RoyalMountClientHandler {
wasAttack = false;
wasSpecial = false;
wasFlightToggle = false;
wasBeam = false;
wasSignature = false;
wasAscend = false;
wasDescend = false;
}
@@ -102,6 +102,8 @@ public class AntarchyForgePayloadHandlers {
case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.FLIGHT_TOGGLE -> mount.toggleMountedFlight(player);
case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.BITE -> mount.handleMountedBite(player);
case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.SPIT -> mount.handleMountedSpit(player);
case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.BEAM -> mount.handleMountedBeam(player);
case com.craisinlord.antarchy.content.network.RoyalMountActionPayload.SIGNATURE -> mount.handleMountedSignature(player);
default -> {
}
}