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-26 16:52:32 -05:00
1 parent 5a8cb58cb0
commit 8626d205f7
132 files changed
+18 -931
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

neoforge-1.21.1/build.gradle
-9
View File
@@ -14,7 +14,6 @@ java {
withSourcesJar()
}
// Add common-1.21.1's sources directly — this module compiles them itself.
sourceSets {
main {
java {
@@ -49,9 +48,6 @@ dependencies {
if (providers.gradleProperty('antarchySodiumCompatTest').orNull == 'true') {
runtimeOnly(files(rootProject.file("infinite_dimensions_jars/sodium-neoforge-0.8.13+mc1.21.1.jar")))
}
// Sodium — compile-only, for portal live views drawn through Sodium's renderer
// (content/client/renderer/sodium, mixins/compat/sodium). Never bundled; that code only
// loads when Sodium is installed. The published jar nests the mod jar, so compile against it.
compileOnly(files(zipTree(rootProject.file("infinite_dimensions_jars/sodium-neoforge-0.8.13+mc1.21.1.jar"))
.matching { include "META-INF/jarjar/net.caffeinemc.sodium-neoforge-*-mod.jar" }))
compileOnly(files(rootProject.file("infinite_dimensions_jars/antos-neoforge-1.21.1-${antos_version}.jar")))
@@ -76,11 +72,6 @@ dependencies {
compileOnly "mezz.jei:jei-1.21.1-neoforge-api:${jei_version}"
runtimeOnly "mezz.jei:jei-1.21.1-neoforge:${jei_version}"
// Configured — optional, gives players an in-game config screen for Antarchy's
// ModConfigSpec-based settings (AntarchyMobsConfig/AntarchyToolsConfig/AntarchyMiscConfig)
// with zero Java code on this side: NeoForge's own config system is auto-discovered.
// No compileOnly needed since nothing here references Configured's classes directly.
// Has no Modrinth release, hence cursemaven (repo already declared in the root build.gradle).
runtimeOnly("curse.maven:configured-${configured_curseforge_id}:${configured_curseforge_file_id_neoforge}")
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_1_21_1}"))
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java
-2
View File
@@ -680,8 +680,6 @@ public final class AntarchyConfigModuleNeoforge {
AntarchySettings.setPortalGunMoonBlockCap(AntarchyMiscConfig.portalGunMoonBlockCap());
// Misc
AntarchySettings.setElythiaFireflyParticlesEnabled(AntarchyMiscConfig.elythiaFireflyParticlesEnabled());
AntarchySettings.setDreamSandFallingBlockGravityMultiplier(AntarchyMiscConfig.dreamSandFallingBlockGravityMultiplier());
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMiscConfig.java
-27
View File
@@ -5,24 +5,18 @@ import net.neoforged.neoforge.common.ModConfigSpec;
public final class AntarchyMiscConfig {
public static final ModConfigSpec SPEC;
// Elythia
private static final ModConfigSpec.BooleanValue ELYTHIA_FIREFLY_PARTICLES_ENABLED;
// Dream Sand
private static final ModConfigSpec.DoubleValue DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER;
// Ichor
private static final ModConfigSpec.BooleanValue ICHOR_WITHER_ENABLED;
// Hushweed
private static final ModConfigSpec.DoubleValue HUSHWEED_SPORE_LIFETIME_SECONDS;
// Infinite Dimensions
private static final ModConfigSpec.BooleanValue DISABLE_INFINITY_BOOK_PORTAL_CREATION;
private static final ModConfigSpec.BooleanValue RAINBOW_ANTS_LEAD_TO_INFINITY_DIMENSIONS;
private static final ModConfigSpec.DoubleValue RAINBOW_ANT_INFINITY_EASTER_EGG_CHANCE;
// Permanent portals
private static final ModConfigSpec.BooleanValue PERMANENT_PORTALS_ENABLED;
private static final ModConfigSpec.BooleanValue PERMANENT_PORTALS_FLINT_AND_STEEL_ENABLED;
private static final ModConfigSpec.BooleanValue ELYTHIA_PORTAL_ENABLED;
@@ -42,7 +36,6 @@ public final class AntarchyMiscConfig {
private static final ModConfigSpec.IntValue PORTAL_GUN_MOON_PORTAL_SECONDS;
private static final ModConfigSpec.IntValue PORTAL_GUN_MOON_BLOCK_CAP;
// Diamond Minecart
private static final ModConfigSpec.BooleanValue DIAMOND_MINECART_ENABLED;
private static final ModConfigSpec.BooleanValue DIAMOND_MINECART_PLACES_RAILS;
private static final ModConfigSpec.DoubleValue DIAMOND_MINECART_CRUISE_SPEED;
@@ -53,11 +46,9 @@ public final class AntarchyMiscConfig {
private static final ModConfigSpec.BooleanValue DIAMOND_MINECART_MOB_DAMAGE_ENABLED;
private static final ModConfigSpec.DoubleValue DIAMOND_MINECART_MAX_MOB_DAMAGE;
// Hoverboard
private static final ModConfigSpec.DoubleValue HOVERBOARD_MAX_SPEED;
private static final ModConfigSpec.DoubleValue HOVERBOARD_ACCELERATION;
// World / misc toggles
private static final ModConfigSpec.BooleanValue DUPLICATOR_TREE_ENABLED;
private static final ModConfigSpec.BooleanValue GLOW_VINES_UNDER_LEAVES;
private static final ModConfigSpec.BooleanValue SWING_THROUGH_GRASS_ENABLED;
@@ -69,8 +60,6 @@ public final class AntarchyMiscConfig {
ModConfigSpec.Builder b = new ModConfigSpec.Builder();
// Elythia
b.push("elythia");
ELYTHIA_FIREFLY_PARTICLES_ENABLED = b
.comment("Whether firefly ambient particles appear at night in the Elythia dimension.")
@@ -78,15 +67,11 @@ public final class AntarchyMiscConfig {
b.pop();
// Dream Sand
b.push("dreamSand");
DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER = b.comment("Multiplier applied to dream sand's falling-block gravity, i.e. how slowly it falls as a block.").defineInRange("fallingBlockGravityMultiplier", 0.4D, 0.0D, 16.0D);
b.pop();
// Ichor
b.push("ichor");
ICHOR_WITHER_ENABLED = b
.comment("If true, players submerged in ichor receive a Wither effect.")
@@ -94,8 +79,6 @@ public final class AntarchyMiscConfig {
b.pop();
// Hushweed
b.push("hushweed");
HUSHWEED_SPORE_LIFETIME_SECONDS = b
.comment("How long (in seconds) a Hushweed spore projectile stays alive before disappearing.")
@@ -103,8 +86,6 @@ public final class AntarchyMiscConfig {
b.pop();
// Infinity Dimensions
b.push("infinityDimensions");
DISABLE_INFINITY_BOOK_PORTAL_CREATION = b
.comment("If true, book and quills cannot be thrown into nether portals to create random dimensions.")
@@ -124,8 +105,6 @@ public final class AntarchyMiscConfig {
b.pop();
// Permanent Portals
b.push("permanentPortals");
PERMANENT_PORTALS_ENABLED = b.comment("Master toggle for sacrifice-activated permanent portals.").define("permanentPortalsEnabled", true);
PERMANENT_PORTALS_FLINT_AND_STEEL_ENABLED = b.comment("Whether flint and steel can ignite permanent portal frames.").define("permanentPortalsFlintAndSteelEnabled", false);
@@ -151,8 +130,6 @@ public final class AntarchyMiscConfig {
b.pop();
// Diamond Minecart
b.push("diamondMinecart");
DIAMOND_MINECART_ENABLED = b.comment("Master toggle for the diamond minecart's custom propulsion and rail-laying behavior.") .define("enabled", true);
DIAMOND_MINECART_PLACES_RAILS = b.comment("Whether the cart automatically places normal rails from the rider's inventory.") .define("placesRails", true);
@@ -166,16 +143,12 @@ public final class AntarchyMiscConfig {
b.pop();
// Hoverboard
b.push("hoverboard");
HOVERBOARD_MAX_SPEED = b.comment("Maximum hoverboard speed in blocks/tick while moving forward.").defineInRange("maxSpeed", 6.0D, 0.05D, 12.0D);
HOVERBOARD_ACCELERATION = b.comment("Hoverboard speed gained per tick while moving forward. Lower values take longer to reach top speed.").defineInRange("acceleration", 0.05D, 0.001D, 1.0D);
b.pop();
// World / visual toggles
b.push("world");
DUPLICATOR_TREE_ENABLED = b.comment("If false, duplicator trees do not generate and duplicator saplings produce nothing.").define("duplicatorTreeEnabled", true);
GLOW_VINES_UNDER_LEAVES = b.comment("Whether glow vines can be placed and survive when attached under leaf blocks.") .define("glowVinesUnderLeaves", true);
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java
+1 -103
View File
@@ -6,8 +6,6 @@ public final class AntarchyMobsConfig {
public static final ModConfigSpec SPEC;
// Ants
private static final ModConfigSpec.BooleanValue ANTS_STEAL_FROM_CHESTS;
private static final ModConfigSpec.BooleanValue BROWN_ANT_REQUIRES_REAGENT;
@@ -40,36 +38,26 @@ public final class AntarchyMobsConfig {
// Easter Bunny
private static final ModConfigSpec.BooleanValue EASTER_BUNNY_ENABLED;
private static final ModConfigSpec.IntValue EASTER_BUNNY_NATURAL_SPAWN_CHANCE_PERCENT;
// Wasp
private static final ModConfigSpec.DoubleValue WASP_HEALTH;
private static final ModConfigSpec.DoubleValue WASP_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue WASP_MOVEMENT_SPEED;
// Bomber
private static final ModConfigSpec.DoubleValue BOMBER_HEALTH;
private static final ModConfigSpec.DoubleValue BOMBER_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue BOMBER_EXPLOSION_DAMAGE;
private static final ModConfigSpec.DoubleValue BOMBER_EXPLOSION_RADIUS;
// Springbug
private static final ModConfigSpec.DoubleValue SPRINGBUG_HEALTH;
private static final ModConfigSpec.DoubleValue SPRINGBUG_POUNCE_DAMAGE;
private static final ModConfigSpec.DoubleValue SPRINGBUG_CAMOUFLAGE_ALPHA;
// Emperor Scorpion
private static final ModConfigSpec.DoubleValue EMPEROR_SCORPION_HEALTH;
private static final ModConfigSpec.DoubleValue EMPEROR_SCORPION_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue EMPEROR_SCORPION_MOVEMENT_SPEED;
@@ -99,8 +87,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue SCORPION_KNOCKBACK_RESISTANCE;
// Kraken
private static final ModConfigSpec.DoubleValue KRAKEN_HEALTH;
private static final ModConfigSpec.DoubleValue KRAKEN_ATTACK_DAMAGE;
private static final ModConfigSpec.BooleanValue KRAKEN_SQUID_SPAWN_ENABLED;
@@ -115,8 +101,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue KRAKEN_BOSS_BAR_RANGE;
private static final ModConfigSpec.DoubleValue KRAKEN_LIGHTNING_DAMAGE_PHASE_ONE;
// Royal Bosses
private static final ModConfigSpec.DoubleValue KING_HEALTH;
private static final ModConfigSpec.DoubleValue QUEEN_HEALTH;
private static final ModConfigSpec.DoubleValue KING_ATTACK_DAMAGE;
@@ -153,8 +137,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue KING_FIREBALL_DAMAGE, KING_FIREBALL_RADIUS, KING_ICEBALL_DAMAGE, KING_ICEBALL_RADIUS, KING_ICE_SPIKE_DAMAGE;
private static final ModConfigSpec.IntValue KING_FIREBALL_COOLDOWN_TICKS, KING_ICEBALL_COOLDOWN_TICKS, KING_ICE_SPIKE_COOLDOWN_TICKS, KING_ELEMENTAL_TERRAIN_CAP;
// Royal mounts
private static final ModConfigSpec.IntValue ROYAL_EGG_HATCH_CHANCE;
private static final ModConfigSpec.DoubleValue ROYAL_BOLT_DAMAGE;
private static final ModConfigSpec.DoubleValue PRINCE_HEALTH;
@@ -173,8 +155,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue PRINCESS_FOLLOW_RANGE;
// Brutalfly
private static final ModConfigSpec.DoubleValue BRUTALFLY_HEALTH;
private static final ModConfigSpec.DoubleValue BRUTALFLY_SWIPE_DAMAGE;
private static final ModConfigSpec.DoubleValue BRUTALFLY_SPIT_DAMAGE;
@@ -186,8 +166,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue BRUTALFLY_FLYING_SPEED;
// Mantis
private static final ModConfigSpec.DoubleValue MANTIS_HEALTH;
private static final ModConfigSpec.DoubleValue MANTIS_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue MANTIS_MOVEMENT_SPEED;
@@ -195,8 +173,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.BooleanValue MANTIS_IGNORE_LIGHT_LEVEL;
// Alpha Mantis
private static final ModConfigSpec.DoubleValue ALPHA_MANTIS_HEALTH;
private static final ModConfigSpec.DoubleValue ALPHA_MANTIS_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue ALPHA_MANTIS_MOVEMENT_SPEED;
@@ -206,8 +182,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue ALPHA_MANTIS_DAMAGE_RANGE;
// Rolly Polly
private static final ModConfigSpec.DoubleValue ROLLY_POLLY_HEALTH;
private static final ModConfigSpec.DoubleValue ROLLY_POLLY_MOVEMENT_SPEED;
private static final ModConfigSpec.DoubleValue ROLLY_POLLY_ROLL_SPEED_MULTIPLIER;
@@ -218,16 +192,12 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue ROLLY_POLLY_ROLLED_ARMOR_BONUS;
// Flytrap
private static final ModConfigSpec.DoubleValue FLYTRAP_HEALTH;
private static final ModConfigSpec.DoubleValue FLYTRAP_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue FLYTRAP_GRAB_DAMAGE;
private static final ModConfigSpec.IntValue FLYTRAP_SWEEP_HIT_COOLDOWN_TICKS;
// Caterpillar
private static final ModConfigSpec.DoubleValue CATERPILLAR_HEALTH;
private static final ModConfigSpec.DoubleValue CATERPILLAR_MOVEMENT_SPEED;
private static final ModConfigSpec.DoubleValue CATERPILLAR_PUPATION_TIME_SECONDS;
@@ -268,13 +238,9 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue OCTOPUS_BOMB_ATTACK_DAMAGE;
// Ant Dance
private static final ModConfigSpec.DoubleValue ANT_DANCE_RADIUS;
// Reverie
private static final ModConfigSpec.DoubleValue REVERIE_HEALTH;
private static final ModConfigSpec.DoubleValue REVERIE_INTEREST_RADIUS;
private static final ModConfigSpec.DoubleValue REVERIE_ABANDON_PLAYER_DISTANCE;
@@ -289,8 +255,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.IntValue REVERIE_DUPLICATION_COOLDOWN_TICKS;
// Nightmare
private static final ModConfigSpec.DoubleValue NIGHTMARE_HEALTH;
private static final ModConfigSpec.DoubleValue NIGHTMARE_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue NIGHTMARE_MOVEMENT_SPEED;
@@ -304,8 +268,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.BooleanValue DIMENSIONAL_TEARS_SPAWN_NATURALLY;
// Basilisk
private static final ModConfigSpec.BooleanValue BASILISK_PETRIFYING_GAZE_ENABLED;
private static final ModConfigSpec.IntValue BASILISK_SPAWN_MAX_LIGHT_LEVEL;
private static final ModConfigSpec.DoubleValue BASILISK_HEALTH;
@@ -329,8 +291,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.IntValue BASILISK_PREY_PETRIFY_TICKS;
// Toreterror
private static final ModConfigSpec.DoubleValue TORETERROR_HEALTH;
private static final ModConfigSpec.DoubleValue TORETERROR_DAMAGE_RANGE;
private static final ModConfigSpec.DoubleValue TORETERROR_JUMP_ATTACK_DAMAGE;
@@ -344,14 +304,10 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue WATER_BOMB_KNOCKBACK;
// Crawling Blight
private static final ModConfigSpec.DoubleValue CRAWLING_BLIGHT_HEALTH;
private static final ModConfigSpec.DoubleValue CRAWLING_BLIGHT_ATTACK_DAMAGE;
// Skulking Fright
private static final ModConfigSpec.DoubleValue SKULKING_FRIGHT_HEALTH;
private static final ModConfigSpec.DoubleValue SKULKING_FRIGHT_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue MANTICORE_HEALTH;
@@ -362,8 +318,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.IntValue QUEEN_MANTICORE_SUMMON_COUNT;
private static final ModConfigSpec.DoubleValue QUEEN_MANTICORE_SUMMON_RANGE;
// Jerry
private static final ModConfigSpec.DoubleValue JERRY_INFANT_HEALTH;
private static final ModConfigSpec.DoubleValue JERRY_INFANT_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue JERRY_MATURE_HEALTH;
@@ -374,37 +328,25 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue JERRY_GAMMA_ATTACK_DAMAGE;
// Cheep
private static final ModConfigSpec.DoubleValue CHEEP_HEALTH;
private static final ModConfigSpec.DoubleValue CHEEP_ATTACK_DAMAGE;
// Dorrie
private static final ModConfigSpec.DoubleValue DORRIE_HEALTH;
// Ouranwood Deer
private static final ModConfigSpec.DoubleValue OURANWOOD_DEER_HEALTH;
// Glimmer
private static final ModConfigSpec.DoubleValue GLIMMER_HEALTH;
// Hercules Beetle
private static final ModConfigSpec.DoubleValue HERCULES_BEETLE_HEALTH;
private static final ModConfigSpec.DoubleValue HERCULES_BEETLE_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue HERCULES_BEETLE_CHARGE_DAMAGE;
private static final ModConfigSpec.DoubleValue HERCULES_BEETLE_DAMAGE_RANGE;
// Lucid
private static final ModConfigSpec.DoubleValue LUCID_ATTACK_RANGE;
private static final ModConfigSpec.DoubleValue LUCID_PEARL_INVERTED_DURATION_SECONDS;
private static final ModConfigSpec.DoubleValue LUCID_HEALTH;
@@ -413,8 +355,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue LUCID_FLYING_SPEED;
private static final ModConfigSpec.DoubleValue LUCID_KNOCKBACK_RESISTANCE;
// Vortex
private static final ModConfigSpec.DoubleValue VORTEX_HEALTH;
private static final ModConfigSpec.DoubleValue VORTEX_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue VORTEX_MOVEMENT_SPEED;
@@ -432,8 +372,6 @@ public final class AntarchyMobsConfig {
private static final ModConfigSpec.DoubleValue VORTEX_LENS_LAUNCH_STRENGTH;
// Dread effect
private static final ModConfigSpec.BooleanValue DREAD_HALLUCINATION_SOUNDS_ENABLED;
private static final ModConfigSpec.DoubleValue DREAD_HALLUCINATION_SOUND_MIN_INTERVAL;
private static final ModConfigSpec.DoubleValue DREAD_HALLUCINATION_SOUND_MAX_INTERVAL;
@@ -445,8 +383,6 @@ public final class AntarchyMobsConfig {
ModConfigSpec.Builder b = new ModConfigSpec.Builder();
// Ants (shared)
ANTS_STEAL_FROM_CHESTS = b
.comment("Whether ants will steal edible items from nearby chest inventories.")
.define("antsStealFromChests", true);
@@ -528,8 +464,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Easter Bunny
b.push("easterBunny");
EASTER_BUNNY_ENABLED = b
.comment(
@@ -546,8 +480,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Wasp
b.push("wasp");
WASP_HEALTH = b.comment("Base max health.") .defineInRange("health", 16.0D, 1.0D, 32768.0D);
WASP_ATTACK_DAMAGE = b.comment("Base attack damage.") .defineInRange("attackDamage", 4.0D, 0.0D, 1024.0D);
@@ -555,8 +487,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Bomber
b.push("bomber");
BOMBER_HEALTH = b.comment("Base max health.") .defineInRange("health", 10.0D, 1.0D, 32768.0D);
BOMBER_ATTACK_DAMAGE = b.comment("Direct damage dealt on contact before detonation.") .defineInRange("attackDamage", 4.0D, 0.0D, 1024.0D);
@@ -565,8 +495,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Springbug
b.push("springbug");
SPRINGBUG_HEALTH = b.comment("Base max health.").defineInRange("health", 100.0D, 1.0D, 32768.0D);
SPRINGBUG_POUNCE_DAMAGE = b.comment("Damage dealt on a successful pounce latch.").defineInRange("pounceDamage", 2.0D, 0.0D, 1024.0D);
@@ -574,8 +502,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Emperor Scorpion
b.push("emperorScorpion");
EMPEROR_SCORPION_HEALTH = b.comment("Base max health.").defineInRange("health", 300.0D, 1.0D, 32768.0D);
EMPEROR_SCORPION_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 28.0D, 0.0D, 1024.0D);
@@ -613,8 +539,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Kraken
b.push("kraken");
KRAKEN_HEALTH = b.comment("Base max health.") .defineInRange("health", 1500.0D, 1.0D, 32768.0D);
KRAKEN_ATTACK_DAMAGE = b.comment("Base attack damage.") .defineInRange("attackDamage", 45.0D, 0.0D, 1024.0D);
@@ -720,8 +644,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Brutalfly
b.push("brutalfly");
BRUTALFLY_HEALTH = b.comment("Base max health.") .defineInRange("health", 200.0D, 1.0D, 32768.0D);
BRUTALFLY_SWIPE_DAMAGE = b.comment("Damage dealt by a claw swipe.") .defineInRange("swipeDamage", 15.0D, 0.0D, 1024.0D);
@@ -735,8 +657,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Mantis
b.push("mantis");
MANTIS_HEALTH = b.comment("Base max health.") .defineInRange("health", 50.0D, 1.0D, 32768.0D);
MANTIS_ATTACK_DAMAGE = b.comment("Base attack damage.") .defineInRange("attackDamage", 9.0D, 0.0D, 1024.0D);
@@ -746,8 +666,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Alpha Mantis
b.push("alphaMantis");
ALPHA_MANTIS_HEALTH = b.comment("Base max health.") .defineInRange("health", 250.0D, 1.0D, 32768.0D);
ALPHA_MANTIS_ATTACK_DAMAGE = b.comment("Base attack damage.") .defineInRange("attackDamage", 18.0D, 0.0D, 1024.0D);
@@ -759,8 +677,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Rolly Polly
b.push("rollyPolly");
ROLLY_POLLY_HEALTH = b.comment("Base max health.") .defineInRange("health", 25.0D, 1.0D, 32768.0D);
ROLLY_POLLY_MOVEMENT_SPEED = b.comment("Base movement speed.") .defineInRange("movementSpeed", 0.3D, 0.0D, 10.0D);
@@ -773,8 +689,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Flytrap
b.push("flytrap");
FLYTRAP_HEALTH = b.comment("Base max health.") .defineInRange("health", 80.0D, 1.0D, 32768.0D);
FLYTRAP_ATTACK_DAMAGE = b.comment("Damage dealt by the sweep attack.") .defineInRange("attackDamage", 10.0D, 0.0D, 1024.0D);
@@ -785,8 +699,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Caterpillar
b.push("caterpillar");
CATERPILLAR_HEALTH = b.defineInRange("health", 6.0D, 0.1D, 32768.0D);
CATERPILLAR_MOVEMENT_SPEED = b.defineInRange("movementSpeed", 0.24D, 0.0D, 10.0D);
@@ -852,8 +764,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Ant Dance
b.push("antDance");
ANT_DANCE_RADIUS = b
.comment("Radius in blocks where ants will dance around a playing jukebox.")
@@ -861,8 +771,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Reverie
b.push("reverie");
REVERIE_HEALTH = b.comment("Base max health.") .defineInRange("health", 20.0D, 1.0D, 1024.0D);
REVERIE_INTEREST_RADIUS = b.comment("How far the Reverie notices and starts following a player.") .defineInRange("interestRadius", 16.0D, 1.0D, 64.0D);
@@ -878,8 +786,6 @@ public final class AntarchyMobsConfig {
REVERIE_DUPLICATION_COOLDOWN_TICKS = b.comment("Cooldown in ticks before Blood Crystal can duplicate the Reverie again.") .defineInRange("duplicationCooldownTicks", 6000, 20, 24000);
b.pop();
// Nightmare
b.push("nightmare");
NIGHTMARE_HEALTH = b.comment("Base max health.").defineInRange("health", 180.0D, 1.0D, 32768.0D);
NIGHTMARE_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 16.0D, 0.0D, 1024.0D);
@@ -898,8 +804,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Basilisk
b.push("basilisk");
BASILISK_PETRIFYING_GAZE_ENABLED = b
.comment("If false, the Basilisk will not use its petrifying gaze and will never apply the Paralyzed effect.")
@@ -929,8 +833,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Lucid
b.push("lucid");
LUCID_ATTACK_RANGE = b
.comment("Attack range in blocks. The Lucid fires its gravity blast when a target enters this radius.")
@@ -945,8 +847,6 @@ public final class AntarchyMobsConfig {
LUCID_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.5D, 0.0D, 1.0D);
b.pop();
// Vortex
b.push("vortex");
VORTEX_HEALTH = b.comment("Base max health.").defineInRange("health", 70.0D, 1.0D, 32768.0D);
VORTEX_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 4.0D, 0.0D, 1024.0D);
@@ -966,8 +866,6 @@ public final class AntarchyMobsConfig {
b.pop();
// Dread effect
b.push("dread");
b.push("hallucinationSounds");
@@ -982,7 +880,7 @@ public final class AntarchyMobsConfig {
DREAD_HALLUCINATION_MOB_MAX_INTERVAL = b.comment("Maximum seconds between apparition spawns.").defineInRange("maxIntervalSeconds", 16.0D, 0.1D, 300.0D);
b.pop();
b.pop(); // dread
b.pop();
b.push("crawlingBlight");
CRAWLING_BLIGHT_HEALTH = b.comment("Base max health.").defineInRange("health", 15.0D, 1.0D, 32768.0D);
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyToolsConfig.java
-67
View File
@@ -6,16 +6,12 @@ public final class AntarchyToolsConfig {
public static final ModConfigSpec SPEC;
// Basilisk Dagger
private static final ModConfigSpec.DoubleValue BASILISK_DAGGER_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue BASILISK_DAGGER_ATTACK_SPEED;
private static final ModConfigSpec.IntValue BASILISK_DAGGER_POISON_DURATION_TICKS;
private static final ModConfigSpec.IntValue BASILISK_DAGGER_POISON_AMPLIFIER;
// Ultimate Tools
private static final ModConfigSpec.DoubleValue ULTIMATE_SWORD_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue ULTIMATE_SWORD_ATTACK_SPEED;
private static final ModConfigSpec.DoubleValue ULTIMATE_PICKAXE_ATTACK_DAMAGE;
@@ -33,8 +29,6 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.IntValue ULTIMATE_TOOLS_TREE_FELLING_MAX_LOGS;
// Ultimate Bow
private static final ModConfigSpec.DoubleValue ULTIMATE_BOW_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue ULTIMATE_BOW_PLAYER_HEAL;
private static final ModConfigSpec.DoubleValue ULTIMATE_BOW_DRAW_SPEED_MULTIPLIER;
@@ -42,22 +36,16 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.IntValue ULTIMATE_BOW_ENCHANTABILITY;
// Ultimate Crossbow
private static final ModConfigSpec.DoubleValue ULTIMATE_CROSSBOW_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue ULTIMATE_CROSSBOW_CHARGE_SPEED_MULTIPLIER;
private static final ModConfigSpec.IntValue ULTIMATE_CROSSBOW_ENCHANTABILITY;
// Ultimate Mace
private static final ModConfigSpec.DoubleValue ULTIMATE_MACE_DAMAGE_MULTIPLIER;
private static final ModConfigSpec.DoubleValue ULTIMATE_MACE_ATTACK_SPEED;
private static final ModConfigSpec.IntValue ULTIMATE_MACE_ENCHANTABILITY;
// Ultimate Armor
private static final ModConfigSpec.BooleanValue ULTIMATE_ARMOR_COMES_ENCHANTED;
private static final ModConfigSpec.IntValue ULTIMATE_ARMOR_ENCHANTABILITY;
private static final ModConfigSpec.IntValue ULTIMATE_HELMET_ARMOR_VALUE;
@@ -117,14 +105,10 @@ public final class AntarchyToolsConfig {
ROYAL_GUARDIAN_BOUNDARY_DROP_TICKS, ROYAL_GUARDIAN_BOUNDARY_PROJECTILE_CAP;
// Battle Axe
private static final ModConfigSpec.DoubleValue BATTLE_AXE_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue BATTLE_AXE_ATTACK_SPEED;
// Big Bertha
private static final ModConfigSpec.DoubleValue BIG_BERTHA_ATTACK_DAMAGE;
private static final ModConfigSpec.DoubleValue BIG_BERTHA_REACH_BONUS;
private static final ModConfigSpec.DoubleValue BIG_BERTHA_ATTACK_SPEED;
@@ -163,8 +147,6 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.IntValue BLOOD_CRYSTAL_KATANA_DASH_COOLDOWN_TICKS;
// Nightmare Gear
private static final ModConfigSpec.IntValue NIGHTMARE_HELMET_ARMOR_VALUE;
private static final ModConfigSpec.IntValue NIGHTMARE_CHESTPLATE_ARMOR_VALUE;
private static final ModConfigSpec.IntValue NIGHTMARE_LEGGINGS_ARMOR_VALUE;
@@ -184,14 +166,10 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.DoubleValue NIGHTMARE_SWORD_SCALING_FACTOR;
// Fallen King's Crown
private static final ModConfigSpec.IntValue FALLEN_KING_CROWN_ARMOR_VALUE;
private static final ModConfigSpec.DoubleValue FALLEN_KING_CROWN_ARMOR_TOUGHNESS;
// Blood Crystal Armor
private static final ModConfigSpec.IntValue BLOOD_CRYSTAL_ARMOR_SHIELD_RECHARGE_TICKS;
private static final ModConfigSpec.IntValue BLOOD_CRYSTAL_APPLE_SHIELD_COUNT;
private static final ModConfigSpec.IntValue BLOOD_CRYSTAL_APPLE_DURATION_TICKS;
@@ -208,8 +186,6 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.IntValue BLOOD_CRYSTAL_BOOTS_DURABILITY;
// Squidzooka
private static final ModConfigSpec.DoubleValue SQUIDZOOKA_COOLDOWN_SECONDS;
private static final ModConfigSpec.DoubleValue SQUIDZOOKA_LAUNCH_VELOCITY;
private static final ModConfigSpec.DoubleValue RPO_LAUNCHER_COOLDOWN_SECONDS;
@@ -218,8 +194,6 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.DoubleValue RPO_LAUNCHER_EXPLOSION_RADIUS;
// Size Rays
private static final ModConfigSpec.BooleanValue SIZE_CHANGING_RAYS_ENABLED;
private static final ModConfigSpec.DoubleValue SIZE_RAY_COOLDOWN_SECONDS;
private static final ModConfigSpec.DoubleValue SIZE_RAY_MIN_SCALE;
@@ -229,8 +203,6 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.DoubleValue GROWTH_POTION_DELTA;
// Gravity Gun
private static final ModConfigSpec.BooleanValue GRAVITY_GUN_ENABLED;
private static final ModConfigSpec.BooleanValue GRAVITY_GUN_BLOCKS_ENABLED;
private static final ModConfigSpec.BooleanValue GRAVITY_GUN_ENTITIES_ENABLED;
@@ -254,17 +226,9 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.DoubleValue EYE_OF_THE_STORM_SURGE_RETURN_STRENGTH;
private static final ModConfigSpec.DoubleValue EYE_OF_THE_STORM_SURGE_DAMAGE;
// Critter Cage
private static final ModConfigSpec.DoubleValue CRITTER_CAGE_MAX_CAPTURABLE_WIDTH;
private static final ModConfigSpec.DoubleValue CRITTER_CAGE_MAX_CAPTURABLE_HEIGHT;
// Miner's Dream
// Miscellaneous items / consumables
private static final ModConfigSpec.DoubleValue DUCT_TAPE_REPAIR_PERCENT_PER_USE;
private static final ModConfigSpec.DoubleValue POTENT_NYXITE_INVERTED_DURATION_SECONDS;
private static final ModConfigSpec.IntValue CORNEA_EAR_NIGHT_VISION_SECONDS;
@@ -274,7 +238,6 @@ public final class AntarchyToolsConfig {
private static final ModConfigSpec.IntValue AMERICAN_REGENERATION_DURATION_TICKS;
private static final ModConfigSpec.IntValue AMERICAN_REGENERATION_AMPLIFIER;
// Moggles
private static final ModConfigSpec.DoubleValue MOGGLES_VISION_RADIUS;
@@ -282,8 +245,6 @@ public final class AntarchyToolsConfig {
ModConfigSpec.Builder b = new ModConfigSpec.Builder();
// Basilisk Dagger
b.push("basiliskDagger");
BASILISK_DAGGER_ATTACK_DAMAGE = b.comment("Attack damage.") .defineInRange("attackDamage", 6.0D, 0.0D, 1024.0D);
BASILISK_DAGGER_ATTACK_SPEED = b.comment("Attack speed.") .defineInRange("attackSpeed", -1.8D, -10.0D, 10.0D);
@@ -292,8 +253,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Ultimate Tools
b.push("ultimateTools");
ULTIMATE_SWORD_ATTACK_DAMAGE = b.comment("Attack damage of the Ultimate Sword.") .defineInRange("swordAttackDamage", 30.0D, 0.0D, 1024.0D);
ULTIMATE_SWORD_ATTACK_SPEED = b.comment("Attack speed of the Ultimate Sword.") .defineInRange("swordAttackSpeed", -2.4D, -10.0D, 10.0D);
@@ -317,8 +276,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Ultimate Bow
b.push("ultimateBow");
ULTIMATE_BOW_ATTACK_DAMAGE = b.comment("Damage dealt to non-player targets.") .defineInRange("attackDamage", 18.0D, 0.0D, 1024.0D);
ULTIMATE_BOW_PLAYER_HEAL = b.comment("Health restored to players hit by arrows from this bow.") .defineInRange("playerHeal", 8.0D, 0.0D, 1024.0D);
@@ -328,8 +285,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Ultimate Crossbow
b.push("ultimateCrossbow");
ULTIMATE_CROSSBOW_ATTACK_DAMAGE = b.comment("Damage dealt by projectiles fired from the Ultimate Crossbow.").defineInRange("attackDamage", 8.0D, 0.0D, 1024.0D);
ULTIMATE_CROSSBOW_CHARGE_SPEED_MULTIPLIER = b
@@ -342,8 +297,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Ultimate Mace
b.push("ultimateMace");
ULTIMATE_MACE_DAMAGE_MULTIPLIER = b.comment("Multiplier on both base damage and smash bonus. 1.5 = 50% stronger than a normal mace.").defineInRange("damageMultiplier", 1.5D, 0.1D, 16.0D);
ULTIMATE_MACE_ATTACK_SPEED = b.comment("Attack speed of the Ultimate Mace.") .defineInRange("attackSpeed", -3.4D, -10.0D, 10.0D);
@@ -351,8 +304,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Ultimate Armor
b.push("ultimateArmor");
ULTIMATE_ARMOR_COMES_ENCHANTED = b.comment("If true, newly crafted Ultimate Armor has Protection, Fire Protection, Projectile Protection, and Blast Protection.").define("comesEnchanted", true);
ULTIMATE_ARMOR_ENCHANTABILITY = b.comment("Enchantability for all Ultimate Armor pieces.") .defineInRange("enchantability", 10, 0, 100);
@@ -430,16 +381,12 @@ public final class AntarchyToolsConfig {
b.pop();
// Battle Axe
b.push("battleAxe");
BATTLE_AXE_ATTACK_DAMAGE = b.comment("Attack damage of the Battle Axe.").defineInRange("attackDamage", 46.0D, 0.0D, 4096.0D);
BATTLE_AXE_ATTACK_SPEED = b.comment("Attack speed of the Battle Axe.") .defineInRange("attackSpeed", -3.1D, -10.0D, 10.0D);
b.pop();
// Big Bertha
b.push("bigBertha");
BIG_BERTHA_ATTACK_DAMAGE = b.comment("Attack damage of Big Bertha.") .defineInRange("attackDamage", 55.0D, 0.0D, 4096.0D);
BIG_BERTHA_REACH_BONUS = b.comment("Extra attack range in blocks while held in main hand.") .defineInRange("reachBonus", 3.0D, 0.0D, 32.0D);
@@ -492,8 +439,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Nightmare Gear
b.push("nightmareArmor");
NIGHTMARE_HELMET_ARMOR_VALUE = b.comment("Armor points of the Nightmare Helmet. (Netherite default: 3)") .defineInRange("helmetArmor", 3, 0, 100);
NIGHTMARE_CHESTPLATE_ARMOR_VALUE = b.comment("Armor points of the Nightmare Chestplate. (Netherite default: 8)") .defineInRange("chestplateArmor", 8, 0, 100);
@@ -533,8 +478,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Blood Crystal Armor
b.push("bloodCrystalArmor");
BLOOD_CRYSTAL_ARMOR_SHIELD_RECHARGE_TICKS = b.comment("Ticks (20/s) for each armor Bloodglass Shield to recharge after shattering. Default: 600 (30s).").defineInRange("armorShieldRechargeTicks", 600, 1, 72000);
BLOOD_CRYSTAL_APPLE_SHIELD_COUNT = b.comment("Number of Bloodglass Shields granted by a Blood Crystal Apple (Bloodglass Ward level). Default: 2.").defineInRange("appleShieldCount", 2, 1, 8);
@@ -553,8 +496,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Squidzooka
b.push("squidzooka");
SQUIDZOOKA_COOLDOWN_SECONDS = b.comment("Cooldown in seconds after firing. Set to 0 to disable.").defineInRange("cooldownSeconds", 1.0D, 0.0D, 3600.0D);
SQUIDZOOKA_LAUNCH_VELOCITY = b.comment("Initial launch velocity applied to the Missile Squid.") .defineInRange("launchVelocity", 2.1D, 0.1D, 20.0D);
@@ -568,8 +509,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Size Rays
b.push("sizeRays");
SIZE_CHANGING_RAYS_ENABLED = b
.comment(
@@ -586,8 +525,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Gravity Gun
b.push("gravityGun");
GRAVITY_GUN_ENABLED = b.comment("Master toggle for the Gravity Gun.") .define("enabled", true);
GRAVITY_GUN_BLOCKS_ENABLED = b.comment("If false, the Gravity Gun cannot grab blocks.") .define("blocksEnabled", true);
@@ -617,8 +554,6 @@ public final class AntarchyToolsConfig {
b.pop();
// Critter Cage
b.push("critterCage");
CRITTER_CAGE_MAX_CAPTURABLE_WIDTH = b.comment("Maximum capturable entity width/depth based on the live hitbox, in blocks.").defineInRange("maxCapturableWidth", 1.65D, 0.1D, 64.0D);
CRITTER_CAGE_MAX_CAPTURABLE_HEIGHT = b.comment("Maximum capturable entity height based on the live hitbox, in blocks.").defineInRange("maxCapturableHeight", 1.65D, 0.1D, 64.0D);
@@ -626,8 +561,6 @@ public final class AntarchyToolsConfig {
// Miscellaneous items / consumables
b.push("ductTape");
DUCT_TAPE_REPAIR_PERCENT_PER_USE = b
.comment("Fraction of max durability repaired per use. 0.25 = 25% per application.")
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/MogglesClientRenderer.java
-2
View File
@@ -30,13 +30,11 @@ public final class MogglesClientRenderer {
return;
}
// Run cave BFS (internally rate-limited to every 40 ticks).
MogglesCaveDetector.tick(player, level);
BlockPos target = MogglesCaveDetector.getCaveTarget();
if (target == null) return;
// Spawn particle trail toward the cave every 2 ticks.
if (level.getGameTime() % 2 != 0) return;
Vec3 eye = player.getEyePosition();
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/content/fluid/AntiwaterFluid.java
-53
View File
@@ -115,58 +115,6 @@ public abstract class AntiwaterFluid extends BaseFlowingFluid {
return net.minecraft.world.level.material.Fluids.EMPTY.defaultFluidState();
}
/*
@Override
protected void spread(Level level, BlockPos pos, FluidState state) {
if (state.isEmpty()) {
return;
}
if (!state.isSource() && !this.isFlowingStateValid(level, pos, state)) {
level.setBlockAndUpdate(pos, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState());
this.scheduleCleanup(level, pos);
return;
}
BlockState blockState = level.getBlockState(pos);
int nextAmount = state.getAmount() - 1;
BlockPos abovePos = pos.above();
BlockState aboveState = level.getBlockState(abovePos);
FluidState aboveFluid = level.getFluidState(abovePos);
if (!aboveState.isSolid() && !aboveFluid.getType().isSame(this)) {
FluidState upwardState = this.getFlowing(8, false);
if (this.canSpreadTo(level, pos, blockState, Direction.UP, abovePos, aboveState, aboveFluid, upwardState.getType())) {
this.spreadTo(level, abovePos, aboveState, Direction.UP, upwardState);
}
}
if (!this.canHangAt(level, pos)) {
return;
}
if (nextAmount <= 0) {
return;
}
for (Direction direction : Direction.Plane.HORIZONTAL) {
BlockPos targetPos = pos.relative(direction);
BlockState targetState = level.getBlockState(targetPos);
FluidState targetFluid = targetState.getFluidState();
if (!this.canSpreadHorizontallyInto(level, targetPos)) {
continue;
}
FluidState horizontalState = this.getFlowing(Math.min(nextAmount, MAX_HORIZONTAL_SPREAD_AMOUNT), false);
if (!this.canSpreadTo(level, pos, blockState, direction, targetPos, targetState, targetFluid, horizontalState.getType())) {
continue;
}
this.spreadTo(level, targetPos, targetState, direction, horizontalState);
}
}
*/
@Override
protected void spread(Level level, BlockPos pos, FluidState state) {
if (state.isEmpty()) {
@@ -317,7 +265,6 @@ public abstract class AntiwaterFluid extends BaseFlowingFluid {
BlockState aboveState = level.getBlockState(abovePos);
FluidState aboveFluid = level.getFluidState(abovePos);
// Antiwater flowing into water solidifies rather than displacing it
if (aboveFluid.getFluidType() == NeoForgeMod.WATER_TYPE.value()) {
BlockState result = state.isSource()
? AntarchyNeoforgeBlocks.ANTIMETAL.get().defaultBlockState()
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/mixins/entity/ParalyzedMobFreezeMixin.java
-3
View File
@@ -8,9 +8,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Mob.class)
/*
* Stops mob AI movement while paralyzed.
*/
public abstract class ParalyzedMobFreezeMixin {
@Inject(method = "serverAiStep", at = @At("HEAD"))
private void antarchy$freezeAiWhileParalyzed(CallbackInfo ci) {
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/mixins/infinity/AmendmentRareOresMixin.java
-6
View File
@@ -12,12 +12,6 @@ import java.util.List;
import java.util.Map;
@Mixin(value = Amendment.class, remap = false)
/*
* Makes Antarchy's uranium/titanium ores and blocks much rarer in Infinite Dimensions'
* procedural dimensions. This is done natively via Infinity's own amendment system rather
* than relying on players editing infinity's config, keyed off the antarchy:infinity_dimension_rare_ores
* block tag so the list stays data-driven and native to Antarchy.
*/
public class AmendmentRareOresMixin {
@Inject(method = "getAmendmentList", at = @At("RETURN"), remap = false)
private static void antarchy$addRareOreAmendment(CallbackInfoReturnable<Map<ConfigType, List<Amendment>>> cir) {
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/mixins/infinity/PortalCreatorMixin.java
-3
View File
@@ -14,9 +14,6 @@ import net.codexarchonic.infinity.util.teleport.PortalCreator;
import net.minecraft.server.level.ServerLevel;
@Mixin(value = PortalCreator.class, remap = false)
/*
* Blocks Infinity portal creation when the config says no
*/
public interface PortalCreatorMixin {
@Inject(
method = "tryCreatePortalFromItem(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/item/ItemEntity;)V",
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java
-10
View File
@@ -648,9 +648,6 @@ public final class AntarchyNeoForgeEvents {
- access.antarchy$getArmorShieldsActive() - access.antarchy$getArmorShieldLostCount())
);
int currentCap = access.antarchy$getAppleShieldsActive() + access.antarchy$getAppleShieldLostCount();
// Only grant newly-added capacity (e.g. first application, or a higher amplifier).
// A mere duration refresh of an already-active ward must not reset shields that are
// already lost, nor restart their recharge timer.
if (targetCap > currentCap) {
access.antarchy$setAppleShieldsActive(access.antarchy$getAppleShieldsActive() + (targetCap - currentCap));
syncBloodglass((ServerPlayer) player);
@@ -748,7 +745,6 @@ public final class AntarchyNeoForgeEvents {
BloodglassAccess access = (BloodglassAccess) player;
if (fromIsBC && !toIsBC) {
// Unequipped BC armor, remove one shield slot
if (access.antarchy$getArmorShieldsActive() > 0) {
access.antarchy$setArmorShieldsActive(access.antarchy$getArmorShieldsActive() - 1);
} else if (access.antarchy$getArmorShieldLostCount() > 0) {
@@ -758,7 +754,6 @@ public final class AntarchyNeoForgeEvents {
}
}
} else if (!fromIsBC && toIsBC) {
// Newly equipped BC armor,only add if not already accounted for (by respawn init)
int bcPieces = countBCArmorPieces(player);
int currentTotal = access.antarchy$getArmorShieldsActive() + access.antarchy$getArmorShieldLostCount();
if (currentTotal < bcPieces) {
@@ -766,8 +761,6 @@ public final class AntarchyNeoForgeEvents {
access.antarchy$setArmorRechargeTimer(AntarchySettings.bloodCrystalArmorShieldRechargeTicks());
}
} else if (fromIsBC) {
// BC armor replaced with another BC armor (or same after re-equip sequence)
// Remove old shield, start recharging new one and reset timer
if (access.antarchy$getArmorShieldsActive() > 0) {
access.antarchy$setArmorShieldsActive(access.antarchy$getArmorShieldsActive() - 1);
} else if (access.antarchy$getArmorShieldLostCount() > 0) {
@@ -811,7 +804,6 @@ public final class AntarchyNeoForgeEvents {
int totalActive = access.antarchy$getTotalShieldsActive();
if (totalActive <= 0) return;
// Consume apple shields first, then armor shields
if (access.antarchy$getAppleShieldsActive() > 0) {
access.antarchy$setAppleShieldsActive(access.antarchy$getAppleShieldsActive() - 1);
access.antarchy$setAppleShieldLostCount(access.antarchy$getAppleShieldLostCount() + 1);
@@ -858,8 +850,6 @@ public final class AntarchyNeoForgeEvents {
return;
}
// Shared item code now scales arrow base damage directly so attribute and projectile
// modifiers stay in the damage pipeline. Leave non-player hits untouched here.
}
static void handleUltimateCrossbowDamage(LivingIncomingDamageEvent event) {
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java
-1
View File
@@ -892,7 +892,6 @@ public final class AntarchyNeoforgeBlocks {
public static final DeferredBlock<com.craisinlord.antarchy.content.block.StarCoralWallFanBlock> STAR_CORAL_WALL_FAN = BLOCKS.register("star_coral_wall_fan",
() -> new com.craisinlord.antarchy.content.block.StarCoralWallFanBlock(DEAD_STAR_CORAL_WALL_FAN.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.TUBE_CORAL_WALL_FAN).lightLevel(state -> 8)));
// Block entity types
public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<com.craisinlord.antarchy.content.block.entity.RoyalEggBlockEntity>> ROYAL_EGG_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("royal_egg",
() -> BlockEntityType.Builder.of(
com.craisinlord.antarchy.content.block.entity.RoyalEggBlockEntity::new,
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java
-3
View File
@@ -48,7 +48,6 @@ public final class AntarchyNeoforgeItems {
static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Antarchy.MODID);
private static final DeferredRegister<ArmorMaterial> ARMOR_MATERIALS = DeferredRegister.create(Registries.ARMOR_MATERIAL, Antarchy.MODID);
// Tier constants
public static final Tier ULTIMATE_TIER = new SimpleToolTier(
3072,
10.5F,
@@ -218,7 +217,6 @@ public final class AntarchyNeoforgeItems {
0.0F
));
// Block items
public static final DeferredItem<net.minecraft.world.item.BlockItem> DUPLICATOR_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DUPLICATOR_LOG);
public static final DeferredItem<net.minecraft.world.item.BlockItem> OURANWOOD_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.OURANWOOD_LOG);
public static final DeferredItem<net.minecraft.world.item.BlockItem> OURANWOOD_WOOD_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.OURANWOOD_WOOD);
@@ -1124,7 +1122,6 @@ public final class AntarchyNeoforgeItems {
() -> new KrakensGraspItem(
new Item.Properties().stacksTo(1).durability(250).rarity(Rarity.EPIC).fireResistant()));
// Spawn eggs
public static final DeferredItem<DeferredSpawnEggItem> EASTER_BUNNY_SPAWN_EGG = ITEMS.register("easter_bunny_spawn_egg",
() -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.EASTER_BUNNY, 0xFFF2B2, 0xFF85B5, new Item.Properties()));
public static final DeferredItem<DeferredSpawnEggItem> DORRIE_SPAWN_EGG = ITEMS.register("dorrie_spawn_egg",
neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java
-7
View File
@@ -171,7 +171,6 @@ public final class AntarchyNeoforgeMisc {
() -> new MenuType<>(com.craisinlord.antarchy.content.menu.GiantFryingPanMenu::new, FeatureFlags.DEFAULT_FLAGS)
);
// Mob effects
public static final DeferredHolder<MobEffect, DreadMobEffect> DREAD = MOB_EFFECTS.register("dread", DreadMobEffect::new);
public static final DeferredHolder<MobEffect, BleedingMobEffect> BLEEDING = MOB_EFFECTS.register("bleeding", BleedingMobEffect::new);
public static final DeferredHolder<MobEffect, BloodMoonMobEffect> BLOOD_MOON = MOB_EFFECTS.register("blood_moon", BloodMoonMobEffect::new);
@@ -186,7 +185,6 @@ public final class AntarchyNeoforgeMisc {
public static final DeferredHolder<MobEffect, ShrinkMobEffect> SHRINKING_EFFECT = MOB_EFFECTS.register("shrinking", ShrinkMobEffect::new);
public static final DeferredHolder<MobEffect, GrowthMobEffect> GROWTH_EFFECT = MOB_EFFECTS.register("growth", GrowthMobEffect::new);
// Potions
public static final DeferredHolder<Potion, Potion> INVERSION = POTIONS.register("inversion",
() -> new Potion(new MobEffectInstance(AnthologyEffects.inverted(), 600)));
public static final DeferredHolder<Potion, Potion> LONG_INVERSION = POTIONS.register("long_inversion",
@@ -228,7 +226,6 @@ public final class AntarchyNeoforgeMisc {
public static final DeferredHolder<Potion, Potion> EXTREME_GROWING = POTIONS.register("extreme_growing",
() -> new Potion("growing", new MobEffectInstance(GROWTH_EFFECT, 600, 2)));
// Fluids
public static final DeferredHolder<Fluid, Fluid> BILE = FLUIDS.register("bile",
() -> new BaseFlowingFluid.Source(bileProperties()));
public static final DeferredHolder<Fluid, Fluid> FLOWING_BILE = FLUIDS.register("flowing_bile",
@@ -246,7 +243,6 @@ public final class AntarchyNeoforgeMisc {
public static final DeferredHolder<Fluid, Fluid> FLOWING_LUMEN = FLUIDS.register("flowing_lumen",
() -> new BaseFlowingFluid.Flowing(lumenProperties()));
// Particle types
public static final DeferredHolder<ParticleType<?>, SimpleParticleType> DREAM_FIRE_FLAME = PARTICLE_TYPES.register("dream_fire_flame",
() -> new SimpleParticleType(true));
public static final DeferredHolder<ParticleType<?>, SimpleParticleType> BUG_SPRAY_PARTICLE = PARTICLE_TYPES.register("bug_spray",
@@ -292,7 +288,6 @@ public final class AntarchyNeoforgeMisc {
public static final DeferredHolder<ParticleType<?>, ParticleType<InvertedGeyserParticleOptions>> INVERTED_GEYSER_ERUPTION = PARTICLE_TYPES.register("inverted_geyser_eruption",
() -> particleType(InvertedGeyserParticleOptions::codec, InvertedGeyserParticleOptions::streamCodec));
// Features
public static final DeferredHolder<Feature<?>, RedAntNestFeature> RED_ANT_NEST_FEATURE = FEATURES.register("red_ant_nest",
() -> new RedAntNestFeature(SimpleBlockConfiguration.CODEC));
public static final DeferredHolder<Feature<?>, BrownAntNestFeature> BROWN_ANT_NEST_FEATURE = FEATURES.register("brown_ant_nest",
@@ -455,13 +450,11 @@ public final class AntarchyNeoforgeMisc {
public static final DeferredHolder<Feature<?>, ThoraxisIchorLakeFeature> THORAXIS_ICHOR_LAKE = FEATURES.register("thoraxis_ichor_lake",
() -> new ThoraxisIchorLakeFeature(NoneFeatureConfiguration.CODEC));
// Biome sources
public static final DeferredHolder<MapCodec<? extends BiomeSource>, MapCodec<ElythiaBiomeSource>> ELYTHIA_BIOME_SOURCE = BIOME_SOURCES.register("elythia_biome_source",
() -> ElythiaBiomeSource.CODEC);
public static final DeferredHolder<MapCodec<? extends BiomeSource>, MapCodec<ThoraxisBiomeSource>> THORAXIS_BIOME_SOURCE = BIOME_SOURCES.register("thoraxis_biome_source",
() -> ThoraxisBiomeSource.CODEC);
// Density function
public static final DeferredHolder<MapCodec<? extends DensityFunction>, MapCodec<ElythiaRiverCarveFunction>> ELYTHIA_RIVER_CARVE = DENSITY_FUNCTION_TYPES.register("elythia_river_carve",
() -> ElythiaRiverCarveFunction.CODEC);