diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java index b49ed2dd..350bfe8b 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/AntarchySettings.java @@ -79,8 +79,6 @@ public final class AntarchySettings { private static double scorpionWhipPullStrength = 0.75D; private static double scorpionWhipHeavyPullMultiplier = 0.25D; private static double scorpionWhipSelfPullMultiplier = 0.45D; - private static int scorpionWhipReelCooldownTicks = 10; - private static int scorpionWhipSnapCooldownTicks = 30; private static int bloodCrystalKatanaAttackDamage = 7; private static double bloodCrystalKatanaLaunchStrength = 1.1D; private static int bloodCrystalKatanaTrailDurationTicks = 12; @@ -90,6 +88,11 @@ public final class AntarchySettings { private static double bigBerthaNoneModeDamageBonusPercent = 15.0D; private static double bigBerthaNightmareDamageBonusPercent = 30.0D; private static double potentNyxiteInvertedDurationSeconds = 60.0D; + private static int dimensionalTearLifetimeTicks = 24000; + private static int dimensionalTearInvertedDurationTicks = 2400; + private static int dimensionalTearEmergenceMinIntervalTicks = 2400; + private static int dimensionalTearEmergenceMaxIntervalTicks = 7200; + private static float dimensionalTearLucidEventChance = 0.65F; private static int ultimateToolEnchantability = 25; private static int ultimateArmorEnchantability = 10; private static int ultimateBowEnchantability = 20; @@ -132,7 +135,6 @@ public final class AntarchySettings { private static double rollyPollyRollSpeedMultiplier = 2.2D; private static int rollyPollyTameChance = 3; private static double rollyPollyBowlingDamage = 3.0D; - private static double rollyPollyTumbleDamage = 3.0D; private static double rollyPollyBowlingKnockback = 0.8D; private static double rollyPollyArmor = 2.0D; private static double rollyPollyRolledArmorBonus = 16.0D; @@ -175,7 +177,6 @@ public final class AntarchySettings { private static double dreamSandJumpVelocityMultiplier = 1.3D; private static double dreamSandGravityMultiplier = 0.45D; private static double dreamSandEffectDurationSeconds = 7.0D; - private static double dreamSandFallDamageMultiplier = 0.4D; private static double dreamSandFallingBlockGravityMultiplier = 0.4D; private static boolean ichorWitherEnabled = true; private static int nightmareHelmetArmorValue = 3; @@ -303,7 +304,6 @@ public final class AntarchySettings { private static double bedBugArmor = 2.0D; private static double jumpyBugHealth = 100.0D; private static double jumpyBugPounceDamage = 12.0D; - private static double jumpyBugLatchDamage = 12.0D; private static double jumpyBugCamouflageAlpha = 0.18D; private static double brutalflyArmor = 10.0D; private static double brutalflyArmorToughness = 4.0D; @@ -319,7 +319,6 @@ public final class AntarchySettings { private static double krakenFlyingSpeed = 0.24D; private static double krakenKnockbackResistance = 0.8D; private static double krakenArmor = 8.0D; - private static double krakenProjectileDamageTakenMultiplier = 0.5D; private static double krakenBossBarRange = 40.0D; private static double krakenFollowRange = 96.0D; private static double krakenDamageRange = 35.0D; @@ -392,11 +391,8 @@ public final class AntarchySettings { private static double ductTapeRepairPercentPerUse = 0.25D; private static double ultimateArmorKnockbackResistance = 0.1D; private static double nightmareArmorKnockbackResistance = 0.1D; - private static double nightmareArmorDreadAuraRangePerPiece = 2.0D; private static double primordialArmorKnockbackPerPiece = 0.5D; private static double mogglesVisionRadius = 20.0D; - private static int mogglesVisionMaxLight = 7; - private static double mogglesVisionAlpha = 0.65D; private static int fallenKingCrownArmorValue = 2; private static double fallenKingCrownArmorToughness = 0.0D; private static boolean permanentPortalsEnabled = true; @@ -405,7 +401,6 @@ public final class AntarchySettings { private static boolean thoraxisPortalEnabled = true; private static boolean cavarynPortalEnabled = true; private static boolean elythiaFireflyParticlesEnabled = true; - private static boolean glowingTorchflowers = true; private static int bloodCrystalArmorShieldRechargeTicks = 600; private static int bloodCrystalAppleShieldCount = 2; private static int bloodCrystalAppleDurationTicks = 2400; @@ -426,13 +421,11 @@ public final class AntarchySettings { private static double toreterrorJumpAttackKnockback = 2.5D; private static double toreterrorSpinDamage = 6.0D; private static double toreterrorSpinKnockback = 0.9D; - private static double toreterrorRangedWaterBombChance = 0.35D; private static double toreterrorProjectileDamageMultiplier = 0.5D; private static double waterBombDamage = 6.0D; private static int waterBombLifetimeTicks = 120; private static double waterBombGravity = 0.12D; private static double waterBombKnockback = 1.2D; - private static double waterCannonCooldownSeconds = 1.5D; private static double creepingHorrorHealth = 15.0D; private static double creepingHorrorAttackDamage = 6.0D; private static double lurkingTerrorHealth = 15.0D; @@ -525,10 +518,6 @@ public final class AntarchySettings { return glowVinesUnderLeaves; } - public static boolean glowingTorchflowers() { - return glowingTorchflowers; - } - public static boolean swingThroughGrassEnabled() { return swingThroughGrassEnabled; } @@ -685,6 +674,46 @@ public final class AntarchySettings { return potentNyxiteInvertedDurationSeconds; } + public static int dimensionalTearLifetimeTicks() { + return dimensionalTearLifetimeTicks; + } + + public static void setDimensionalTearLifetimeTicks(int value) { + dimensionalTearLifetimeTicks = value; + } + + public static int dimensionalTearInvertedDurationTicks() { + return dimensionalTearInvertedDurationTicks; + } + + public static void setDimensionalTearInvertedDurationTicks(int value) { + dimensionalTearInvertedDurationTicks = value; + } + + public static int dimensionalTearEmergenceMinIntervalTicks() { + return dimensionalTearEmergenceMinIntervalTicks; + } + + public static void setDimensionalTearEmergenceMinIntervalTicks(int value) { + dimensionalTearEmergenceMinIntervalTicks = value; + } + + public static int dimensionalTearEmergenceMaxIntervalTicks() { + return dimensionalTearEmergenceMaxIntervalTicks; + } + + public static void setDimensionalTearEmergenceMaxIntervalTicks(int value) { + dimensionalTearEmergenceMaxIntervalTicks = value; + } + + public static float dimensionalTearLucidEventChance() { + return dimensionalTearLucidEventChance; + } + + public static void setDimensionalTearLucidEventChance(float value) { + dimensionalTearLucidEventChance = value; + } + public static int ultimateToolEnchantability() { return ultimateToolEnchantability; } @@ -871,10 +900,6 @@ public final class AntarchySettings { return rollyPollyBowlingDamage; } - public static double rollyPollyTumbleDamage() { - return rollyPollyTumbleDamage; - } - public static double rollyPollyBowlingKnockback() { return rollyPollyBowlingKnockback; } @@ -1102,10 +1127,6 @@ public final class AntarchySettings { glowVinesUnderLeaves = value; } - public static void setGlowingTorchflowers(boolean value) { - glowingTorchflowers = value; - } - public static void setSwingThroughGrassEnabled(boolean value) { swingThroughGrassEnabled = value; } @@ -1453,10 +1474,6 @@ public final class AntarchySettings { rollyPollyBowlingDamage = value; } - public static void setRollyPollyTumbleDamage(double value) { - rollyPollyTumbleDamage = value; - } - public static void setRollyPollyBowlingKnockback(double value) { rollyPollyBowlingKnockback = value; } @@ -1666,14 +1683,6 @@ public final class AntarchySettings { dreamSandEffectDurationSeconds = value; } - public static double dreamSandFallDamageMultiplier() { - return dreamSandFallDamageMultiplier; - } - - public static void setDreamSandFallDamageMultiplier(double value) { - dreamSandFallDamageMultiplier = value; - } - public static double dreamSandFallingBlockGravityMultiplier() { return dreamSandFallingBlockGravityMultiplier; } @@ -1714,14 +1723,8 @@ public final class AntarchySettings { public static double nightmareBootsArmorToughness() { return nightmareBootsArmorToughness; } public static void setNightmareBootsArmorToughness(double v) { nightmareBootsArmorToughness = v; } - public static void setNightmareArmorDreadAuraRangePerPiece(double v) { nightmareArmorDreadAuraRangePerPiece = v; } - public static double nightmareArmorDreadAuraRangePerPiece() { return nightmareArmorDreadAuraRangePerPiece; } public static void setMogglesVisionRadius(double v) { mogglesVisionRadius = v; } public static double mogglesVisionRadius() { return mogglesVisionRadius; } - public static void setMogglesVisionMaxLight(int v) { mogglesVisionMaxLight = v; } - public static int mogglesVisionMaxLight() { return mogglesVisionMaxLight; } - public static void setMogglesVisionAlpha(double v) { mogglesVisionAlpha = v; } - public static double mogglesVisionAlpha() { return mogglesVisionAlpha; } public static double nightmareHelmetDoubleDamageChance() { return nightmareHelmetDoubleDamageChance; } public static void setNightmareHelmetDoubleDamageChance(double v) { nightmareHelmetDoubleDamageChance = v; } @@ -2016,10 +2019,6 @@ public final class AntarchySettings { public static double scorpionWhipSelfPullMultiplier() { return scorpionWhipSelfPullMultiplier; } public static void setScorpionWhipSelfPullMultiplier(double value) { scorpionWhipSelfPullMultiplier = value; } - public static int scorpionWhipReelCooldownTicks() { return scorpionWhipReelCooldownTicks; } - public static void setScorpionWhipReelCooldownTicks(int value) { scorpionWhipReelCooldownTicks = value; } - public static int scorpionWhipSnapCooldownTicks() { return scorpionWhipSnapCooldownTicks; } - public static void setScorpionWhipSnapCooldownTicks(int value) { scorpionWhipSnapCooldownTicks = value; } public static int bloodCrystalKatanaAttackDamage() { return bloodCrystalKatanaAttackDamage; } public static void setBloodCrystalKatanaAttackDamage(int value) { bloodCrystalKatanaAttackDamage = value; } @@ -2122,8 +2121,6 @@ public final class AntarchySettings { public static double jumpyBugPounceDamage() { return jumpyBugPounceDamage; } public static void setJumpyBugPounceDamage(double value) { jumpyBugPounceDamage = value; } - public static double jumpyBugLatchDamage() { return jumpyBugLatchDamage; } - public static void setJumpyBugLatchDamage(double value) { jumpyBugLatchDamage = value; } public static double jumpyBugCamouflageAlpha() { return jumpyBugCamouflageAlpha; } public static void setJumpyBugCamouflageAlpha(double value) { jumpyBugCamouflageAlpha = value; } @@ -2169,8 +2166,6 @@ public final class AntarchySettings { public static double krakenArmor() { return krakenArmor; } public static void setKrakenArmor(double value) { krakenArmor = value; } - public static double krakenProjectileDamageTakenMultiplier() { return krakenProjectileDamageTakenMultiplier; } - public static void setKrakenProjectileDamageTakenMultiplier(double value) { krakenProjectileDamageTakenMultiplier = value; } public static double krakenBossBarRange() { return krakenBossBarRange; } public static void setKrakenBossBarRange(double value) { krakenBossBarRange = value; } @@ -2393,8 +2388,6 @@ public final class AntarchySettings { public static void setToreterrorSpinDamage(double v) { toreterrorSpinDamage = v; } public static double toreterrorSpinKnockback() { return toreterrorSpinKnockback; } public static void setToreterrorSpinKnockback(double v) { toreterrorSpinKnockback = v; } - public static void setToreterrorRangedWaterBombChance(double v) { toreterrorRangedWaterBombChance = v; } - public static double toreterrorRangedWaterBombChance() { return toreterrorRangedWaterBombChance; } public static double toreterrorProjectileDamageMultiplier() { return toreterrorProjectileDamageMultiplier; } public static void setToreterrorProjectileDamageMultiplier(double v) { toreterrorProjectileDamageMultiplier = v; } public static double waterBombDamage() { return waterBombDamage; } @@ -2405,8 +2398,6 @@ public final class AntarchySettings { public static void setWaterBombGravity(double v) { waterBombGravity = v; } public static double waterBombKnockback() { return waterBombKnockback; } public static void setWaterBombKnockback(double v) { waterBombKnockback = v; } - public static void setWaterCannonCooldownSeconds(double v) { waterCannonCooldownSeconds = v; } - public static double waterCannonCooldownSeconds() { return waterCannonCooldownSeconds; } public static double creepingHorrorHealth() { return creepingHorrorHealth; } public static void setCreepingHorrorHealth(double v) { creepingHorrorHealth = v; } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java index c81fd12d..c0ad9ae6 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java @@ -6,7 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; public final class ConfigResetGuard { - public static final int RESET_GENERATION = 6; + public static final int RESET_GENERATION = 8; private static final String MARKER_FILE_NAME = ".config_generation"; private ConfigResetGuard() { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java index 46960bf0..65508353 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyObjects.java @@ -27,8 +27,11 @@ import com.craisinlord.antarchy.content.entity.MolewormEntity; import com.craisinlord.antarchy.content.entity.MantisEntity; import com.craisinlord.antarchy.content.entity.ReverieEntity; import com.craisinlord.antarchy.content.entity.ScorpionEntity; +import com.craisinlord.antarchy.content.entity.lucid.LucidEntity; +import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmareBiteEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmarePortalEntity; +import com.craisinlord.antarchy.content.entity.portal.DimensionalTearEntity; import com.craisinlord.antarchy.content.block.entity.AntNestBlockEntity; import com.craisinlord.antarchy.content.block.entity.DreamCampfireBlockEntity; import com.craisinlord.antarchy.content.block.entity.SeashellBlockEntity; @@ -68,10 +71,16 @@ public final class AntarchyObjects { @SuppressWarnings("unchecked") public static Supplier> OCTOPUS_BOMB = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") + public static Supplier> NIGHTMARE = (Supplier>) UNBOUND; + @SuppressWarnings("unchecked") public static Supplier> NIGHTMARE_PORTAL = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") + public static Supplier> DIMENSIONAL_TEAR = (Supplier>) UNBOUND; + @SuppressWarnings("unchecked") public static Supplier> NIGHTMARE_BITE = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") + public static Supplier> LUCID = (Supplier>) UNBOUND; + @SuppressWarnings("unchecked") public static Supplier> MOLEWORM = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") public static Supplier> MANTIS = (Supplier>) UNBOUND; @@ -581,10 +590,22 @@ public final class AntarchyObjects { NIGHTMARE_PORTAL = supplier; } + public static void setDimensionalTear(Supplier> supplier) { + DIMENSIONAL_TEAR = supplier; + } + + public static void setNightmare(Supplier> supplier) { + NIGHTMARE = supplier; + } + public static void setNightmareBite(Supplier> supplier) { NIGHTMARE_BITE = supplier; } + public static void setLucid(Supplier> supplier) { + LUCID = supplier; + } + public static void setLotus(Supplier supplier) { LOTUS = supplier; } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java index 2ad9e7c1..e4aed67a 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchyTags.java @@ -77,6 +77,8 @@ public final class AntarchyTags { public static final TagKey> SCORPION_WHIP_BLACKLIST = TagKey.create(Registries.ENTITY_TYPE, id("scorpion_whip_blacklist")); public static final TagKey> TIGER_EYE_DETECTION_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, id("tiger_eye_detection_immune")); public static final TagKey> LUCID_ANCHOR_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, id("lucid_anchor_immune")); + public static final TagKey> DIMENSIONAL_TEAR_COMMON_SPAWNS = TagKey.create(Registries.ENTITY_TYPE, id("dimensional_tear_common_spawns")); + public static final TagKey> DIMENSIONAL_TEAR_RARE_SPAWNS = TagKey.create(Registries.ENTITY_TYPE, id("dimensional_tear_rare_spawns")); private Entities() { } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java index c57389e5..204bca70 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java @@ -95,6 +95,23 @@ public final class CreativeTabContents { entry("blush_moss_carpet", "building_blocks"), entry("lumen_froglight", "natural_blocks"), entry("roseate_froglight", "natural_blocks"), + entry("nadir_log", "building_blocks"), + entry("nadir_wood", "building_blocks"), + entry("stripped_nadir_log", "building_blocks"), + entry("stripped_nadir_wood", "building_blocks"), + entry("nadir_planks", "building_blocks"), + entry("nadir_stairs", "building_blocks"), + entry("nadir_slab", "building_blocks"), + entry("nadir_fence", "building_blocks"), + entry("nadir_fence_gate", "building_blocks"), + entry("nadir_boat", "building_blocks"), + entry("nadir_chest_boat", "building_blocks"), + entry("nadir_door", "building_blocks"), + entry("nadir_trapdoor", "building_blocks"), + entry("nadir_pressure_plate", "building_blocks"), + entry("nadir_button", "building_blocks"), + entry("nadir_sign", "building_blocks"), + entry("nadir_hanging_sign", "building_blocks"), entry("nyxite", "building_blocks"), entry("nyxite_stairs", "building_blocks"), entry("nyxite_slab", "building_blocks"), @@ -206,6 +223,8 @@ public final class CreativeTabContents { entry("ouranwood_acorn", "natural_blocks"), entry("peach_leaves", "natural_blocks"), entry("peach_sapling", "natural_blocks"), + entry("nadir_veil", "natural_blocks"), + entry("nadir_sapling", "natural_blocks"), entry("duplicator_log", "natural_blocks"), entry("duplicator_sapling", "natural_blocks"), entry("orange_milkweed", "natural_blocks"), diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/basilisk/BasiliskEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/basilisk/BasiliskEntity.java index 9d0e069c..66e5544e 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/basilisk/BasiliskEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/basilisk/BasiliskEntity.java @@ -125,6 +125,7 @@ public class BasiliskEntity extends Monster implements GeoEntity { MobSpawnType spawnReason, BlockPos pos, RandomSource random) { if (spawnReason == MobSpawnType.SPAWN_EGG || spawnReason == MobSpawnType.SPAWNER + || spawnReason == MobSpawnType.TRIAL_SPAWNER || spawnReason == MobSpawnType.COMMAND) { return true; } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MogglesCaveDetector.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MogglesCaveDetector.java index 4ac281e9..71ba9d85 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MogglesCaveDetector.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MogglesCaveDetector.java @@ -1,5 +1,6 @@ package com.craisinlord.antarchy.content.item; +import com.craisinlord.antarchy.config.AntarchySettings; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.player.Player; @@ -23,8 +24,6 @@ public final class MogglesCaveDetector { private static final int SCAN_INTERVAL = 40; /** How far to flood-fill the player's own air pocket before stopping. */ private static final int PLAYER_SPACE_LIMIT = 8; - /** Search radius for the external cave scan. */ - private static final int SCAN_RADIUS = 20; /** Minimum number of air neighbors a candidate block must have (filters tiny cracks). */ private static final int MIN_AIR_NEIGHBORS = 2; @@ -81,7 +80,7 @@ public final class MogglesCaveDetector { // Scan the wider radius for underground air NOT in the player's space. BlockPos nearest = null; double nearestDistSq = Double.MAX_VALUE; - int r = SCAN_RADIUS; + int r = (int) AntarchySettings.mogglesVisionRadius(); for (int dx = -r; dx <= r; dx++) { for (int dy = -r; dy <= r; dy++) { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/BlockEntityTypeSignMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/BlockEntityTypeSignMixin.java index 8943dd41..9a08aa71 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/BlockEntityTypeSignMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/BlockEntityTypeSignMixin.java @@ -30,18 +30,28 @@ public abstract class BlockEntityTypeSignMixin { private static Block antarchy$peachHangingSign; @Unique private static Block antarchy$peachWallHangingSign; + @Unique + private static Block antarchy$nadirSign; + @Unique + private static Block antarchy$nadirWallSign; + @Unique + private static Block antarchy$nadirHangingSign; + @Unique + private static Block antarchy$nadirWallHangingSign; @Inject(method = "isValid", at = @At("HEAD"), cancellable = true) private void antarchy$allowOuranwoodSigns(BlockState state, CallbackInfoReturnable cir) { Object self = this; if (self == BlockEntityType.SIGN) { if (state.is(antarchy$sign()) || state.is(antarchy$wallSign()) - || state.is(antarchy$peachSign()) || state.is(antarchy$peachWallSign())) { + || state.is(antarchy$peachSign()) || state.is(antarchy$peachWallSign()) + || state.is(antarchy$nadirSign()) || state.is(antarchy$nadirWallSign())) { cir.setReturnValue(true); } } else if (self == BlockEntityType.HANGING_SIGN) { if (state.is(antarchy$hangingSign()) || state.is(antarchy$wallHangingSign()) - || state.is(antarchy$peachHangingSign()) || state.is(antarchy$peachWallHangingSign())) { + || state.is(antarchy$peachHangingSign()) || state.is(antarchy$peachWallHangingSign()) + || state.is(antarchy$nadirHangingSign()) || state.is(antarchy$nadirWallHangingSign())) { cir.setReturnValue(true); } } @@ -111,6 +121,38 @@ public abstract class BlockEntityTypeSignMixin { return antarchy$peachWallHangingSign; } + @Unique + private static Block antarchy$nadirSign() { + if (antarchy$nadirSign == null) { + antarchy$nadirSign = antarchy$resolve("nadir_sign"); + } + return antarchy$nadirSign; + } + + @Unique + private static Block antarchy$nadirWallSign() { + if (antarchy$nadirWallSign == null) { + antarchy$nadirWallSign = antarchy$resolve("nadir_wall_sign"); + } + return antarchy$nadirWallSign; + } + + @Unique + private static Block antarchy$nadirHangingSign() { + if (antarchy$nadirHangingSign == null) { + antarchy$nadirHangingSign = antarchy$resolve("nadir_hanging_sign"); + } + return antarchy$nadirHangingSign; + } + + @Unique + private static Block antarchy$nadirWallHangingSign() { + if (antarchy$nadirWallHangingSign == null) { + antarchy$nadirWallHangingSign = antarchy$resolve("nadir_wall_hanging_sign"); + } + return antarchy$nadirWallHangingSign; + } + @Unique private static Block antarchy$resolve(String path) { return BuiltInRegistries.BLOCK.get(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, path)); diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json index c6091973..63a22167 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json @@ -37,6 +37,23 @@ "block.antarchy.peach_sapling": "Peach Sapling", "block.antarchy.peach_sign": "Peach Sign", "block.antarchy.peach_hanging_sign": "Peach Hanging Sign", + "block.antarchy.nadir_log": "Nadir Log", + "block.antarchy.nadir_wood": "Nadir Wood", + "block.antarchy.stripped_nadir_log": "Stripped Nadir Log", + "block.antarchy.stripped_nadir_wood": "Stripped Nadir Wood", + "block.antarchy.nadir_planks": "Nadir Planks", + "block.antarchy.nadir_stairs": "Nadir Stairs", + "block.antarchy.nadir_slab": "Nadir Slab", + "block.antarchy.nadir_fence": "Nadir Fence", + "block.antarchy.nadir_fence_gate": "Nadir Fence Gate", + "block.antarchy.nadir_door": "Nadir Door", + "block.antarchy.nadir_trapdoor": "Nadir Trapdoor", + "block.antarchy.nadir_pressure_plate": "Nadir Pressure Plate", + "block.antarchy.nadir_button": "Nadir Button", + "block.antarchy.nadir_veil": "Nadir Veil", + "block.antarchy.nadir_sapling": "Nadir Sapling", + "block.antarchy.nadir_sign": "Nadir Sign", + "block.antarchy.nadir_hanging_sign": "Nadir Hanging Sign", "block.antarchy.orange_milkweed": "Orange Milkweed", "block.antarchy.pink_milkweed": "Pink Milkweed", "block.antarchy.camellia": "Camellia", @@ -347,6 +364,12 @@ "item.antarchy.peach_hanging_sign": "Peach Hanging Sign", "item.antarchy.peach_boat": "Peach Boat", "item.antarchy.peach_chest_boat": "Peach Chest Boat", + "item.antarchy.nadir_sign": "Nadir Sign", + "item.antarchy.nadir_hanging_sign": "Nadir Hanging Sign", + "item.antarchy.nadir_boat": "Nadir Boat", + "item.antarchy.nadir_chest_boat": "Nadir Chest Boat", + "entity.antarchy.nadir_boat": "Nadir Boat", + "entity.antarchy.nadir_chest_boat": "Nadir Chest Boat", "item.antarchy.orange_milkweed": "Orange Milkweed", "item.antarchy.pink_milkweed": "Pink Milkweed", "item.antarchy.camellia": "Camellia", diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/basilisk_lair/basilisk_lair.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/basilisk_lair/basilisk_lair.nbt index f13ecd9e..b0c247a3 100644 Binary files a/common-1.21.1/src/main/resources/data/antarchy/structure/basilisk_lair/basilisk_lair.nbt and b/common-1.21.1/src/main/resources/data/antarchy/structure/basilisk_lair/basilisk_lair.nbt differ diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/dream_dunes.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/dream_dunes.json index 740b99ee..0a9ccc5f 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/dream_dunes.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/dream_dunes.json @@ -48,7 +48,8 @@ [], [], [ - "antarchy:bluestone_ore" + "antarchy:bluestone_ore", + "antarchy:dimensional_tears" ], [], [ diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/lucid_pools.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/lucid_pools.json index c4640032..e217c9e8 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/lucid_pools.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/lucid_pools.json @@ -51,7 +51,8 @@ [ "antarchy:lucid_blood_crystal_spires", "antarchy:lucid_medium_blood_crystal_spires", - "antarchy:lucid_large_blood_crystal_spires" + "antarchy:lucid_large_blood_crystal_spires", + "antarchy:dimensional_tears" ], [], [ @@ -76,7 +77,7 @@ "monster": [ { "type": "antarchy:lucid", - "weight": 3, + "weight": 1, "minCount": 1, "maxCount": 1 } diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/nightmare_wastes.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/nightmare_wastes.json index e835ccf8..16d3f49f 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/nightmare_wastes.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/nightmare_wastes.json @@ -52,7 +52,8 @@ "antarchy:thoraxis_floor_rib_columns", "antarchy:thoraxis_roof_rib_columns", "antarchy:thoraxis_floor_spikes", - "antarchy:thoraxis_roof_spikes" + "antarchy:thoraxis_roof_spikes", + "antarchy:dimensional_tears" ], [], [], @@ -76,7 +77,7 @@ "monster": [ { "type": "antarchy:nightmare", - "weight": 6, + "weight": 1, "minCount": 1, "maxCount": 1 } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/all_hanging_signs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/all_hanging_signs.json index 7e4be6b5..1aa3938b 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/all_hanging_signs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/all_hanging_signs.json @@ -1,9 +1,11 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_hanging_sign", - "antarchy:ouranwood_wall_hanging_sign", - "antarchy:peach_hanging_sign", - "antarchy:peach_wall_hanging_sign" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_hanging_sign", + "antarchy:ouranwood_wall_hanging_sign", + "antarchy:peach_hanging_sign", + "antarchy:peach_wall_hanging_sign", + "antarchy:nadir_hanging_sign", + "antarchy:nadir_wall_hanging_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json index 746c5071..756c631b 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_hanging_sign", - "antarchy:peach_hanging_sign" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_hanging_sign", + "antarchy:peach_hanging_sign", + "antarchy:nadir_hanging_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/doors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/doors.json index e6ac4fd5..b060f1cd 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/doors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/doors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:uranium_door", - "antarchy:titanium_door" - ] + "replace": false, + "values": [ + "antarchy:uranium_door", + "antarchy:titanium_door", + "antarchy:nadir_door" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/fence_gates.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/fence_gates.json index 738ac5c8..340319a1 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/fence_gates.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/fence_gates.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_fence_gate", - "antarchy:peach_fence_gate" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_fence_gate", + "antarchy:peach_fence_gate", + "antarchy:nadir_fence_gate" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/leaves.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/leaves.json index aee0c428..9c8be388 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/leaves.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/leaves.json @@ -1,7 +1,7 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_leaves", - "antarchy:peach_leaves" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_leaves", + "antarchy:peach_leaves" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs.json index 5fc273ea..549e0617 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs.json @@ -1,16 +1,20 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_log", - "antarchy:ouranwood_wood", - "antarchy:duplicator_log", - "antarchy:mossy_ouranwood_log", - "antarchy:mossy_ouranwood_wood", - "antarchy:stripped_ouranwood_log", - "antarchy:stripped_ouranwood_wood", - "antarchy:peach_log", - "antarchy:peach_wood", - "antarchy:stripped_peach_log", - "antarchy:stripped_peach_wood" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_log", + "antarchy:ouranwood_wood", + "antarchy:duplicator_log", + "antarchy:mossy_ouranwood_log", + "antarchy:mossy_ouranwood_wood", + "antarchy:stripped_ouranwood_log", + "antarchy:stripped_ouranwood_wood", + "antarchy:peach_log", + "antarchy:peach_wood", + "antarchy:stripped_peach_log", + "antarchy:stripped_peach_wood", + "antarchy:nadir_log", + "antarchy:nadir_wood", + "antarchy:stripped_nadir_log", + "antarchy:stripped_nadir_wood" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs_that_burn.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs_that_burn.json index 5fc273ea..549e0617 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs_that_burn.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/logs_that_burn.json @@ -1,16 +1,20 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_log", - "antarchy:ouranwood_wood", - "antarchy:duplicator_log", - "antarchy:mossy_ouranwood_log", - "antarchy:mossy_ouranwood_wood", - "antarchy:stripped_ouranwood_log", - "antarchy:stripped_ouranwood_wood", - "antarchy:peach_log", - "antarchy:peach_wood", - "antarchy:stripped_peach_log", - "antarchy:stripped_peach_wood" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_log", + "antarchy:ouranwood_wood", + "antarchy:duplicator_log", + "antarchy:mossy_ouranwood_log", + "antarchy:mossy_ouranwood_wood", + "antarchy:stripped_ouranwood_log", + "antarchy:stripped_ouranwood_wood", + "antarchy:peach_log", + "antarchy:peach_wood", + "antarchy:stripped_peach_log", + "antarchy:stripped_peach_wood", + "antarchy:nadir_log", + "antarchy:nadir_wood", + "antarchy:stripped_nadir_log", + "antarchy:stripped_nadir_wood" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/mineable/axe.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/mineable/axe.json index c87836aa..01045829 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/mineable/axe.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/mineable/axe.json @@ -1,44 +1,61 @@ { - "replace": false, - "values": [ - "antarchy:duplicator_log", - "antarchy:ouranwood_log", - "antarchy:ouranwood_wood", - "antarchy:mossy_ouranwood_log", - "antarchy:mossy_ouranwood_wood", - "antarchy:stripped_ouranwood_log", - "antarchy:stripped_ouranwood_wood", - "antarchy:ouranwood_planks", - "antarchy:ouranwood_stairs", - "antarchy:ouranwood_slab", - "antarchy:ouranwood_fence", - "antarchy:ouranwood_fence_gate", - "antarchy:ouranwood_door", - "antarchy:ouranwood_trapdoor", - "antarchy:ouranwood_pressure_plate", - "antarchy:ouranwood_button", - "antarchy:ouranwood_sign", - "antarchy:ouranwood_wall_sign", - "antarchy:ouranwood_hanging_sign", - "antarchy:ouranwood_wall_hanging_sign", - "antarchy:peach_log", - "antarchy:peach_wood", - "antarchy:stripped_peach_log", - "antarchy:stripped_peach_wood", - "antarchy:peach_planks", - "antarchy:peach_stairs", - "antarchy:peach_slab", - "antarchy:peach_fence", - "antarchy:peach_fence_gate", - "antarchy:peach_door", - "antarchy:peach_trapdoor", - "antarchy:peach_pressure_plate", - "antarchy:peach_button", - "antarchy:peach_sign", - "antarchy:peach_wall_sign", - "antarchy:peach_hanging_sign", - "antarchy:peach_wall_hanging_sign", - "antarchy:dream_campfire", - "antarchy:glowcap_mushroom_block" - ] + "replace": false, + "values": [ + "antarchy:duplicator_log", + "antarchy:ouranwood_log", + "antarchy:ouranwood_wood", + "antarchy:mossy_ouranwood_log", + "antarchy:mossy_ouranwood_wood", + "antarchy:stripped_ouranwood_log", + "antarchy:stripped_ouranwood_wood", + "antarchy:ouranwood_planks", + "antarchy:ouranwood_stairs", + "antarchy:ouranwood_slab", + "antarchy:ouranwood_fence", + "antarchy:ouranwood_fence_gate", + "antarchy:ouranwood_door", + "antarchy:ouranwood_trapdoor", + "antarchy:ouranwood_pressure_plate", + "antarchy:ouranwood_button", + "antarchy:ouranwood_sign", + "antarchy:ouranwood_wall_sign", + "antarchy:ouranwood_hanging_sign", + "antarchy:ouranwood_wall_hanging_sign", + "antarchy:peach_log", + "antarchy:peach_wood", + "antarchy:stripped_peach_log", + "antarchy:stripped_peach_wood", + "antarchy:peach_planks", + "antarchy:peach_stairs", + "antarchy:peach_slab", + "antarchy:peach_fence", + "antarchy:peach_fence_gate", + "antarchy:peach_door", + "antarchy:peach_trapdoor", + "antarchy:peach_pressure_plate", + "antarchy:peach_button", + "antarchy:peach_sign", + "antarchy:peach_wall_sign", + "antarchy:peach_hanging_sign", + "antarchy:peach_wall_hanging_sign", + "antarchy:dream_campfire", + "antarchy:glowcap_mushroom_block", + "antarchy:nadir_log", + "antarchy:nadir_wood", + "antarchy:stripped_nadir_log", + "antarchy:stripped_nadir_wood", + "antarchy:nadir_planks", + "antarchy:nadir_stairs", + "antarchy:nadir_slab", + "antarchy:nadir_fence", + "antarchy:nadir_fence_gate", + "antarchy:nadir_door", + "antarchy:nadir_trapdoor", + "antarchy:nadir_pressure_plate", + "antarchy:nadir_button", + "antarchy:nadir_sign", + "antarchy:nadir_wall_sign", + "antarchy:nadir_hanging_sign", + "antarchy:nadir_wall_hanging_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/planks.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/planks.json index d98bff17..beb77914 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/planks.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/planks.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_planks", - "antarchy:peach_planks" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_planks", + "antarchy:peach_planks", + "antarchy:nadir_planks" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/saplings.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/saplings.json index 5a06a14d..548aa47f 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/saplings.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/saplings.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_acorn", - "antarchy:peach_sapling" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_acorn", + "antarchy:peach_sapling", + "antarchy:nadir_sapling" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/standing_signs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/standing_signs.json index 6ec9e2a8..67704453 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/standing_signs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/standing_signs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_sign", - "antarchy:peach_sign" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_sign", + "antarchy:peach_sign", + "antarchy:nadir_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/trapdoors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/trapdoors.json index 174efdac..fe128a6b 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/trapdoors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/trapdoors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:uranium_trapdoor", - "antarchy:titanium_trapdoor" - ] + "replace": false, + "values": [ + "antarchy:uranium_trapdoor", + "antarchy:titanium_trapdoor", + "antarchy:nadir_trapdoor" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json index 3472b17e..f99f806d 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_wall_hanging_sign", - "antarchy:peach_wall_hanging_sign" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_wall_hanging_sign", + "antarchy:peach_wall_hanging_sign", + "antarchy:nadir_wall_hanging_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_signs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_signs.json index 406407ee..98760663 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_signs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wall_signs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_wall_sign", - "antarchy:peach_wall_sign" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_wall_sign", + "antarchy:peach_wall_sign", + "antarchy:nadir_wall_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_buttons.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_buttons.json index 1d626cef..adac6b61 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_buttons.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_buttons.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_button", - "antarchy:peach_button" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_button", + "antarchy:peach_button", + "antarchy:nadir_button" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_doors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_doors.json index e4ebd50e..a97b4d54 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_doors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_doors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_door", - "antarchy:peach_door" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_door", + "antarchy:peach_door", + "antarchy:nadir_door" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_fences.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_fences.json index f1b5eb5a..17d8174a 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_fences.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_fences.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_fence", - "antarchy:peach_fence" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_fence", + "antarchy:peach_fence", + "antarchy:nadir_fence" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json index 7f3d5149..ff567df3 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_pressure_plate", - "antarchy:peach_pressure_plate" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_pressure_plate", + "antarchy:peach_pressure_plate", + "antarchy:nadir_pressure_plate" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_slabs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_slabs.json index 9b0b8371..5b700b68 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_slabs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_slabs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_slab", - "antarchy:peach_slab" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_slab", + "antarchy:peach_slab", + "antarchy:nadir_slab" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_stairs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_stairs.json index 5d419448..7af32ee4 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_stairs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_stairs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_stairs", - "antarchy:peach_stairs" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_stairs", + "antarchy:peach_stairs", + "antarchy:nadir_stairs" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json index df34c0e6..85da6c5a 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_trapdoor", - "antarchy:peach_trapdoor" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_trapdoor", + "antarchy:peach_trapdoor", + "antarchy:nadir_trapdoor" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/boats.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/boats.json index fd04ca71..b5846802 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/boats.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/boats.json @@ -1,8 +1,9 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_boat", - "antarchy:ouranwood_chest_boat", - "antarchy:peach_boat" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_boat", + "antarchy:ouranwood_chest_boat", + "antarchy:peach_boat", + "antarchy:nadir_boat" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/chest_boats.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/chest_boats.json index 47f46f23..8344e540 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/chest_boats.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/chest_boats.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_chest_boat", - "antarchy:peach_chest_boat" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_chest_boat", + "antarchy:peach_chest_boat", + "antarchy:nadir_chest_boat" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/doors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/doors.json index e6ac4fd5..b060f1cd 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/doors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/doors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:uranium_door", - "antarchy:titanium_door" - ] + "replace": false, + "values": [ + "antarchy:uranium_door", + "antarchy:titanium_door", + "antarchy:nadir_door" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/fence_gates.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/fence_gates.json index 738ac5c8..340319a1 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/fence_gates.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/fence_gates.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_fence_gate", - "antarchy:peach_fence_gate" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_fence_gate", + "antarchy:peach_fence_gate", + "antarchy:nadir_fence_gate" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/hanging_signs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/hanging_signs.json index 746c5071..756c631b 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/hanging_signs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/hanging_signs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_hanging_sign", - "antarchy:peach_hanging_sign" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_hanging_sign", + "antarchy:peach_hanging_sign", + "antarchy:nadir_hanging_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs.json index 5fc273ea..549e0617 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs.json @@ -1,16 +1,20 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_log", - "antarchy:ouranwood_wood", - "antarchy:duplicator_log", - "antarchy:mossy_ouranwood_log", - "antarchy:mossy_ouranwood_wood", - "antarchy:stripped_ouranwood_log", - "antarchy:stripped_ouranwood_wood", - "antarchy:peach_log", - "antarchy:peach_wood", - "antarchy:stripped_peach_log", - "antarchy:stripped_peach_wood" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_log", + "antarchy:ouranwood_wood", + "antarchy:duplicator_log", + "antarchy:mossy_ouranwood_log", + "antarchy:mossy_ouranwood_wood", + "antarchy:stripped_ouranwood_log", + "antarchy:stripped_ouranwood_wood", + "antarchy:peach_log", + "antarchy:peach_wood", + "antarchy:stripped_peach_log", + "antarchy:stripped_peach_wood", + "antarchy:nadir_log", + "antarchy:nadir_wood", + "antarchy:stripped_nadir_log", + "antarchy:stripped_nadir_wood" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs_that_burn.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs_that_burn.json index 5fc273ea..549e0617 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs_that_burn.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/logs_that_burn.json @@ -1,16 +1,20 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_log", - "antarchy:ouranwood_wood", - "antarchy:duplicator_log", - "antarchy:mossy_ouranwood_log", - "antarchy:mossy_ouranwood_wood", - "antarchy:stripped_ouranwood_log", - "antarchy:stripped_ouranwood_wood", - "antarchy:peach_log", - "antarchy:peach_wood", - "antarchy:stripped_peach_log", - "antarchy:stripped_peach_wood" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_log", + "antarchy:ouranwood_wood", + "antarchy:duplicator_log", + "antarchy:mossy_ouranwood_log", + "antarchy:mossy_ouranwood_wood", + "antarchy:stripped_ouranwood_log", + "antarchy:stripped_ouranwood_wood", + "antarchy:peach_log", + "antarchy:peach_wood", + "antarchy:stripped_peach_log", + "antarchy:stripped_peach_wood", + "antarchy:nadir_log", + "antarchy:nadir_wood", + "antarchy:stripped_nadir_log", + "antarchy:stripped_nadir_wood" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/planks.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/planks.json index d98bff17..beb77914 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/planks.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/planks.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_planks", - "antarchy:peach_planks" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_planks", + "antarchy:peach_planks", + "antarchy:nadir_planks" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/saplings.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/saplings.json index 5a06a14d..548aa47f 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/saplings.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/saplings.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_acorn", - "antarchy:peach_sapling" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_acorn", + "antarchy:peach_sapling", + "antarchy:nadir_sapling" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/signs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/signs.json index 6ec9e2a8..67704453 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/signs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/signs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_sign", - "antarchy:peach_sign" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_sign", + "antarchy:peach_sign", + "antarchy:nadir_sign" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/trapdoors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/trapdoors.json index 174efdac..fe128a6b 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/trapdoors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/trapdoors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:uranium_trapdoor", - "antarchy:titanium_trapdoor" - ] + "replace": false, + "values": [ + "antarchy:uranium_trapdoor", + "antarchy:titanium_trapdoor", + "antarchy:nadir_trapdoor" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_buttons.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_buttons.json index 1d626cef..adac6b61 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_buttons.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_buttons.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_button", - "antarchy:peach_button" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_button", + "antarchy:peach_button", + "antarchy:nadir_button" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_doors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_doors.json index e4ebd50e..a97b4d54 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_doors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_doors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_door", - "antarchy:peach_door" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_door", + "antarchy:peach_door", + "antarchy:nadir_door" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_fences.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_fences.json index f1b5eb5a..17d8174a 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_fences.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_fences.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_fence", - "antarchy:peach_fence" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_fence", + "antarchy:peach_fence", + "antarchy:nadir_fence" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json index 7f3d5149..ff567df3 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_pressure_plate", - "antarchy:peach_pressure_plate" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_pressure_plate", + "antarchy:peach_pressure_plate", + "antarchy:nadir_pressure_plate" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_slabs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_slabs.json index 9b0b8371..5b700b68 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_slabs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_slabs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_slab", - "antarchy:peach_slab" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_slab", + "antarchy:peach_slab", + "antarchy:nadir_slab" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_stairs.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_stairs.json index 5d419448..7af32ee4 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_stairs.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_stairs.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_stairs", - "antarchy:peach_stairs" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_stairs", + "antarchy:peach_stairs", + "antarchy:nadir_stairs" + ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json index df34c0e6..85da6c5a 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json @@ -1,7 +1,8 @@ { - "replace": false, - "values": [ - "antarchy:ouranwood_trapdoor", - "antarchy:peach_trapdoor" - ] + "replace": false, + "values": [ + "antarchy:ouranwood_trapdoor", + "antarchy:peach_trapdoor", + "antarchy:nadir_trapdoor" + ] } diff --git a/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java b/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java index 8b30b89f..df2b329e 100644 --- a/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java +++ b/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java @@ -177,7 +177,6 @@ public final class AntarchyConfigModuleFabric { || name.equals("hushweedSporeLifetimeSeconds") || name.equals("elythiaFireflyParticlesEnabled") || name.equals("duplicatorTreeEnabled") - || name.equals("glowingTorchflowers") || name.equals("glowVinesUnderLeaves") || name.equals("swingThroughGrassEnabled") || name.equals("fabricKeybindingConflictFixEnabled") diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java index 8b30b89f..df2b329e 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyConfigModuleFabric.java @@ -177,7 +177,6 @@ public final class AntarchyConfigModuleFabric { || name.equals("hushweedSporeLifetimeSeconds") || name.equals("elythiaFireflyParticlesEnabled") || name.equals("duplicatorTreeEnabled") - || name.equals("glowingTorchflowers") || name.equals("glowVinesUnderLeaves") || name.equals("swingThroughGrassEnabled") || name.equals("fabricKeybindingConflictFixEnabled") diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java index 03df338c..69c048f8 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java @@ -297,8 +297,11 @@ public final class AntarchyFabricContent { AntarchyObjects.setOctopusBomb(AntarchyFabricEntities.OCTOPUS_BOMB); AntarchyObjects.setTentacle(AntarchyFabricEntities.TENTACLE); + AntarchyObjects.setNightmare(AntarchyFabricEntities.NIGHTMARE); AntarchyObjects.setNightmarePortal(AntarchyFabricEntities.NIGHTMARE_PORTAL); + AntarchyObjects.setDimensionalTear(AntarchyFabricEntities.DIMENSIONAL_TEAR); AntarchyObjects.setNightmareBite(AntarchyFabricEntities.NIGHTMARE_BITE); + AntarchyObjects.setLucid(AntarchyFabricEntities.LUCID); AntarchyObjects.setKrakensGraspTrident(AntarchyFabricEntities.KRAKENS_GRASP_TRIDENT); AntarchyObjects.setLotus(() -> AntarchyFabricBlocks.LOTUS.get()); AntarchyObjects.setKrakenTentacle(() -> AntarchyFabricItems.KRAKEN_TENTACLE.get()); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java index 6047e098..ec8ac6ea 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricEvents.java @@ -83,6 +83,7 @@ public final class AntarchyFabricEvents { ComposterBlock.COMPOSTABLES.put(AntarchyFabricItems.CORNEA_EAR.get(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricBlocks.PEACH_LEAVES.get().asItem(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricItems.PEACH_SAPLING_ITEM.get(), 0.3f); + ComposterBlock.COMPOSTABLES.put(AntarchyFabricItems.NADIR_SAPLING_ITEM.get(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricItems.CORN.get(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricItems.CORN_SEEDS.get(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyFabricItems.PEACH.get(), 0.65f); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyWoodTypes.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyWoodTypes.java index 7b807144..a028df0e 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyWoodTypes.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/AntarchyWoodTypes.java @@ -8,6 +8,7 @@ import net.minecraft.world.level.block.state.properties.WoodType; public final class AntarchyWoodTypes { public static final WoodType OURANWOOD = register("ouranwood"); public static final WoodType PEACH = register("peach"); + public static final WoodType NADIR = register("nadir"); private AntarchyWoodTypes() { } diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java index d4ff1341..87d0718b 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/AntarchyFabricClientBootstrap.java @@ -107,6 +107,8 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricEntities.OURANWOOD_CHEST_BOAT_ENTITY.get(), context -> new OuranwoodBoatRenderer<>(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/ouranwood.png"), true)); EntityRendererRegistry.register(AntarchyFabricEntities.PEACH_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/peach.png"), false)); EntityRendererRegistry.register(AntarchyFabricEntities.PEACH_CHEST_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/peach.png"), true)); + EntityRendererRegistry.register(AntarchyFabricEntities.NADIR_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/nadir.png"), false)); + EntityRendererRegistry.register(AntarchyFabricEntities.NADIR_CHEST_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/nadir.png"), true)); EntityRendererRegistry.register(AntarchyFabricEntities.APPLE_COW.get(), AppleCowRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.GOLDEN_APPLE_COW.get(), AppleCowRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.ENCHANTED_GOLDEN_APPLE_COW.get(), AppleCowRenderer::new); @@ -121,6 +123,7 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricEntities.OCTOPUS_BOMB.get(), OctopusBombRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.NIGHTMARE.get(), NightmareRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.NIGHTMARE_PORTAL.get(), NightmarePortalRenderer::new); + EntityRendererRegistry.register(AntarchyFabricEntities.DIMENSIONAL_TEAR.get(), DimensionalTearRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.NIGHTMARE_BITE.get(), NightmareBiteRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.LUCID.get(), LucidRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.BED_BUG.get(), BedBugRenderer::new); @@ -310,6 +313,11 @@ public final class AntarchyFabricClientBootstrap { BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.PEACH_TRAPDOOR.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.PEACH_SAPLING.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.POTTED_PEACH_SAPLING.get(), RenderType.cutout()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.NADIR_VEIL.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.NADIR_DOOR.get(), RenderType.cutout()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.NADIR_TRAPDOOR.get(), RenderType.cutout()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.NADIR_SAPLING.get(), RenderType.cutout()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.POTTED_NADIR_SAPLING.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.DUPLICATOR_SAPLING.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.ORANGE_MILKWEED.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.PINK_MILKWEED.get(), RenderType.cutout()); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricBlocks.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricBlocks.java index 31a5d37e..7104b741 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricBlocks.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricBlocks.java @@ -255,6 +255,84 @@ public final class AntarchyFabricBlocks { () -> new net.minecraft.world.level.block.WallHangingSignBlock(AntarchyWoodTypes.PEACH, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WALL_HANGING_SIGN))); + public static final DeferredBlock NADIR_LOG = BLOCKS.register("nadir_log", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LOG))); + + + public static final DeferredBlock NADIR_WOOD = BLOCKS.register("nadir_wood", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WOOD))); + + + public static final DeferredBlock STRIPPED_NADIR_LOG = BLOCKS.register("stripped_nadir_log", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STRIPPED_JUNGLE_LOG))); + + + public static final DeferredBlock STRIPPED_NADIR_WOOD = BLOCKS.register("stripped_nadir_wood", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STRIPPED_JUNGLE_WOOD))); + + + public static final DeferredBlock NADIR_PLANKS = BLOCKS.register("nadir_planks", + () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_PLANKS))); + + + public static final DeferredBlock NADIR_STAIRS = BLOCKS.register("nadir_stairs", + () -> new net.minecraft.world.level.block.StairBlock(NADIR_PLANKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_STAIRS))); + + + public static final DeferredBlock NADIR_SLAB = BLOCKS.register("nadir_slab", + () -> new net.minecraft.world.level.block.SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_SLAB))); + + + public static final DeferredBlock NADIR_FENCE = BLOCKS.register("nadir_fence", + () -> new net.minecraft.world.level.block.FenceBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_FENCE))); + + + public static final DeferredBlock NADIR_FENCE_GATE = BLOCKS.register("nadir_fence_gate", + () -> new net.minecraft.world.level.block.FenceGateBlock(net.minecraft.world.level.block.state.properties.WoodType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_FENCE_GATE))); + + + public static final DeferredBlock NADIR_DOOR = BLOCKS.register("nadir_door", + () -> new net.minecraft.world.level.block.DoorBlock(net.minecraft.world.level.block.state.properties.BlockSetType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_DOOR))); + + + public static final DeferredBlock NADIR_TRAPDOOR = BLOCKS.register("nadir_trapdoor", + () -> new net.minecraft.world.level.block.TrapDoorBlock(net.minecraft.world.level.block.state.properties.BlockSetType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_TRAPDOOR))); + + + public static final DeferredBlock NADIR_PRESSURE_PLATE = BLOCKS.register("nadir_pressure_plate", + () -> new net.minecraft.world.level.block.PressurePlateBlock(net.minecraft.world.level.block.state.properties.BlockSetType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_PRESSURE_PLATE))); + + + public static final DeferredBlock NADIR_BUTTON = BLOCKS.register("nadir_button", + () -> new net.minecraft.world.level.block.ButtonBlock(net.minecraft.world.level.block.state.properties.BlockSetType.JUNGLE, 30, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_BUTTON))); + + + public static final DeferredBlock NADIR_VEIL = BLOCKS.register("nadir_veil", + () -> new net.minecraft.world.level.block.Block(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).sound(net.minecraft.world.level.block.SoundType.SLIME_BLOCK).noOcclusion())); + + + public static final DeferredBlock NADIR_SAPLING = BLOCKS.register("nadir_sapling", + () -> new com.craisinlord.antarchy.content.block.NadirSaplingBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SAPLING).randomTicks().noCollission())); + public static final DeferredBlock POTTED_NADIR_SAPLING = BLOCKS.register("potted_nadir_sapling", + () -> new net.minecraft.world.level.block.FlowerPotBlock(NADIR_SAPLING.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.POTTED_DANDELION))); + + + public static final DeferredBlock NADIR_SIGN = BLOCKS.register("nadir_sign", + () -> new net.minecraft.world.level.block.StandingSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_SIGN))); + + + public static final DeferredBlock NADIR_WALL_SIGN = BLOCKS.register("nadir_wall_sign", + () -> new net.minecraft.world.level.block.WallSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WALL_SIGN))); + + + public static final DeferredBlock NADIR_HANGING_SIGN = BLOCKS.register("nadir_hanging_sign", + () -> new net.minecraft.world.level.block.CeilingHangingSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_HANGING_SIGN))); + + + public static final DeferredBlock NADIR_WALL_HANGING_SIGN = BLOCKS.register("nadir_wall_hanging_sign", + () -> new net.minecraft.world.level.block.WallHangingSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WALL_HANGING_SIGN))); + + public static final DeferredBlock DUPLICATOR_SAPLING = BLOCKS.register("duplicator_sapling", () -> new DuplicatorSaplingBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SAPLING).randomTicks().noCollission())); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntities.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntities.java index 3338e776..527bea8c 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntities.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntities.java @@ -25,6 +25,8 @@ import com.craisinlord.antarchy.content.entity.JumpyBugEntity; import com.craisinlord.antarchy.content.entity.StinkBugEntity; import com.craisinlord.antarchy.content.entity.OuranwoodBoatEntity; import com.craisinlord.antarchy.content.entity.OuranwoodChestBoatEntity; +import com.craisinlord.antarchy.content.entity.NadirBoatEntity; +import com.craisinlord.antarchy.content.entity.NadirChestBoatEntity; import com.craisinlord.antarchy.content.entity.AlphaMantisEntity; import com.craisinlord.antarchy.content.entity.MantisEntity; import com.craisinlord.antarchy.content.entity.RollyPollyEntity; @@ -34,6 +36,7 @@ import com.craisinlord.antarchy.content.entity.ScorpionEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmarePortalEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmareBiteEntity; +import com.craisinlord.antarchy.content.entity.portal.DimensionalTearEntity; import com.craisinlord.antarchy.content.entity.ToreterrorEntity; import com.craisinlord.antarchy.content.entity.WaterBombEntity; import com.craisinlord.antarchy.content.entity.kraken.KrakenEntity; @@ -136,6 +139,22 @@ public final class AntarchyFabricEntities { .build("peach_chest_boat")); + public static final DeferredHolder, EntityType> NADIR_BOAT_ENTITY = ENTITY_TYPES.register("nadir_boat", + () -> EntityType.Builder.of(NadirBoatEntity::new, MobCategory.MISC) + .sized(1.375F, 0.5625F) + .clientTrackingRange(10) + .updateInterval(10) + .build("nadir_boat")); + + + public static final DeferredHolder, EntityType> NADIR_CHEST_BOAT_ENTITY = ENTITY_TYPES.register("nadir_chest_boat", + () -> EntityType.Builder.of(NadirChestBoatEntity::new, MobCategory.MISC) + .sized(1.375F, 0.5625F) + .clientTrackingRange(10) + .updateInterval(10) + .build("nadir_chest_boat")); + + public static final DeferredHolder, EntityType> MOLEVORE = ENTITY_TYPES.register("molevore", () -> EntityType.Builder.of(MolevoreEntity::new, MobCategory.MONSTER) .sized(1.95F, 1.1F) @@ -337,6 +356,13 @@ public final class AntarchyFabricEntities { .updateInterval(1) .build("nightmare_portal")); + public static final DeferredHolder, EntityType> DIMENSIONAL_TEAR = ENTITY_TYPES.register("dimensional_tear", + () -> EntityType.Builder.of(DimensionalTearEntity::new, MobCategory.MISC) + .sized(2.8F, 3.2F) + .clientTrackingRange(12) + .updateInterval(1) + .build("dimensional_tear")); + public static final DeferredHolder, EntityType> NIGHTMARE_BITE = ENTITY_TYPES.register("nightmare_bite", () -> EntityType.Builder.of(NightmareBiteEntity::new, MobCategory.MISC) .sized(2.5F, 2.0F) diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java index 800a22c4..fe3cd76f 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java @@ -207,6 +207,51 @@ public final class AntarchyFabricItems { public static final DeferredItem PEACH_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.PEACH_SAPLING); + public static final DeferredItem NADIR_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_LOG); + + + public static final DeferredItem NADIR_WOOD_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_WOOD); + + + public static final DeferredItem STRIPPED_NADIR_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.STRIPPED_NADIR_LOG); + + + public static final DeferredItem STRIPPED_NADIR_WOOD_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.STRIPPED_NADIR_WOOD); + + + public static final DeferredItem NADIR_PLANKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_PLANKS); + + + public static final DeferredItem NADIR_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_STAIRS); + + + public static final DeferredItem NADIR_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_SLAB); + + + public static final DeferredItem NADIR_FENCE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_FENCE); + + + public static final DeferredItem NADIR_FENCE_GATE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_FENCE_GATE); + + + public static final DeferredItem NADIR_DOOR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_DOOR); + + + public static final DeferredItem NADIR_TRAPDOOR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_TRAPDOOR); + + + public static final DeferredItem NADIR_PRESSURE_PLATE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_PRESSURE_PLATE); + + + public static final DeferredItem NADIR_BUTTON_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_BUTTON); + + + public static final DeferredItem NADIR_VEIL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_VEIL); + + + public static final DeferredItem NADIR_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.NADIR_SAPLING); + + public static final DeferredItem ORANGE_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.ORANGE_MILKWEED); @@ -259,6 +304,22 @@ public final class AntarchyFabricItems { () -> new com.craisinlord.antarchy.content.item.PeachChestBoatItem(AntarchyFabricEntities.PEACH_CHEST_BOAT_ENTITY.get(), new Item.Properties().stacksTo(1))); + public static final DeferredItem NADIR_SIGN_ITEM = ITEMS.register("nadir_sign", + () -> new net.minecraft.world.item.SignItem(new Item.Properties().stacksTo(16), AntarchyFabricBlocks.NADIR_SIGN.get(), AntarchyFabricBlocks.NADIR_WALL_SIGN.get())); + + + public static final DeferredItem NADIR_HANGING_SIGN_ITEM = ITEMS.register("nadir_hanging_sign", + () -> new net.minecraft.world.item.HangingSignItem(AntarchyFabricBlocks.NADIR_HANGING_SIGN.get(), AntarchyFabricBlocks.NADIR_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); + + + public static final DeferredItem NADIR_BOAT = ITEMS.register("nadir_boat", + () -> new com.craisinlord.antarchy.content.item.NadirBoatOnlyItem(AntarchyFabricEntities.NADIR_BOAT_ENTITY.get(), new Item.Properties().stacksTo(1))); + + + public static final DeferredItem NADIR_CHEST_BOAT = ITEMS.register("nadir_chest_boat", + () -> new com.craisinlord.antarchy.content.item.NadirChestBoatItem(AntarchyFabricEntities.NADIR_CHEST_BOAT_ENTITY.get(), new Item.Properties().stacksTo(1))); + + public static final DeferredItem CRITTER_CAGE = ITEMS.register("critter_cage", () -> new CritterCageItem(new Item.Properties().stacksTo(16))); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricMisc.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricMisc.java index 5937ce09..241af686 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricMisc.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricMisc.java @@ -60,6 +60,7 @@ import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitinSpikeConfiguratio import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitinSpikeFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.BedBugNestFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.BedBugSurfaceClusterFeature; +import com.craisinlord.antarchy.content.worldgen.thoraxis.DimensionalTearFeature; import com.craisinlord.antarchy.content.worldgen.elythia.ElythiaCloudFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.LucidAntiwaterPoolFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisBiomeSource; @@ -779,6 +780,9 @@ public final class AntarchyFabricMisc { public static final DeferredHolder, ThoraxisDuneFeature> THORAXIS_DUNE = FEATURES.register("thoraxis_dune", () -> new ThoraxisDuneFeature(ThoraxisDuneConfiguration.CODEC)); + public static final DeferredHolder, DimensionalTearFeature> DIMENSIONAL_TEAR = FEATURES.register("dimensional_tear", + () -> new DimensionalTearFeature(NoneFeatureConfiguration.CODEC)); + public static final DeferredHolder, CoralSpikeFeature> ELYTHIA_CORAL_SPIKE = FEATURES.register("elythia_coral_spike", () -> new CoralSpikeFeature(NoneFeatureConfiguration.CODEC)); diff --git a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyConfigModuleForge.java b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyConfigModuleForge.java index 9aa08529..6d802296 100644 --- a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyConfigModuleForge.java +++ b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyConfigModuleForge.java @@ -101,12 +101,36 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setJumpyBugLatchDamage(AntarchyMobsConfig.jumpyBugLatchDamage()); AntarchySettings.setJumpyBugCamouflageAlpha(AntarchyMobsConfig.jumpyBugCamouflageAlpha()); + AntarchySettings.setEmperorScorpionHealth(AntarchyMobsConfig.emperorScorpionHealth()); + AntarchySettings.setEmperorScorpionAttackDamage(AntarchyMobsConfig.emperorScorpionAttackDamage()); + AntarchySettings.setEmperorScorpionArmor(AntarchyMobsConfig.emperorScorpionArmor()); + AntarchySettings.setEmperorScorpionKnockbackResistance(AntarchyMobsConfig.emperorScorpionKnockbackResistance()); + AntarchySettings.setEmperorScorpionMovementSpeed(AntarchyMobsConfig.emperorScorpionMovementSpeed()); + AntarchySettings.setEmperorScorpionFollowRange(AntarchyMobsConfig.emperorScorpionFollowRange()); + AntarchySettings.setEmperorScorpionXpReward(AntarchyMobsConfig.emperorScorpionXpReward()); + AntarchySettings.setEmperorScorpionClawAnimTicks(AntarchyMobsConfig.emperorScorpionClawAnimTicks()); + AntarchySettings.setEmperorScorpionClawHitTick(AntarchyMobsConfig.emperorScorpionClawHitTick()); + AntarchySettings.setEmperorScorpionClawCooldownTicks(AntarchyMobsConfig.emperorScorpionClawCooldownTicks()); + AntarchySettings.setEmperorScorpionStingAnimTicks(AntarchyMobsConfig.emperorScorpionStingAnimTicks()); + AntarchySettings.setEmperorScorpionStingHitTick(AntarchyMobsConfig.emperorScorpionStingHitTick()); + AntarchySettings.setEmperorScorpionStingCooldownTicks(AntarchyMobsConfig.emperorScorpionStingCooldownTicks()); + AntarchySettings.setEmperorScorpionPoisonTicks(AntarchyMobsConfig.emperorScorpionPoisonTicks()); + AntarchySettings.setEmperorScorpionWeaknessTicks(AntarchyMobsConfig.emperorScorpionWeaknessTicks()); + AntarchySettings.setEmperorScorpionSummonIntervalTicks(AntarchyMobsConfig.emperorScorpionSummonIntervalTicks()); + AntarchySettings.setEmperorScorpionMaxSummonedScorpions(AntarchyMobsConfig.emperorScorpionMaxSummonedScorpions()); + AntarchySettings.setEmperorScorpionMaxNearbyScorpions(AntarchyMobsConfig.emperorScorpionMaxNearbyScorpions()); + AntarchySettings.setEmperorScorpionHardenCooldownTicks(AntarchyMobsConfig.emperorScorpionHardenCooldownTicks()); AntarchySettings.setEmperorScorpionDamageRange(AntarchyMobsConfig.emperorScorpionDamageRange()); AntarchySettings.setEmperorScorpionMinDespawnTicks(AntarchyMobsConfig.emperorScorpionMinDespawnTicks()); AntarchySettings.setKrakenHealth(AntarchyMobsConfig.krakenHealth()); AntarchySettings.setKrakenAttackDamage(AntarchyMobsConfig.krakenAttackDamage()); - AntarchySettings.setKrakenProjectileDamageTakenMultiplier(AntarchyMobsConfig.krakenProjectileDamageTakenMultiplier()); + AntarchySettings.setKrakenArmor(AntarchyMobsConfig.krakenArmor()); + AntarchySettings.setKrakenKnockbackResistance(AntarchyMobsConfig.krakenKnockbackResistance()); + AntarchySettings.setKrakenMovementSpeed(AntarchyMobsConfig.krakenMovementSpeed()); + AntarchySettings.setKrakenFlyingSpeed(AntarchyMobsConfig.krakenFlyingSpeed()); + AntarchySettings.setKrakenBossBarRange(AntarchyMobsConfig.krakenBossBarRange()); + AntarchySettings.setKrakenLightningDamagePhaseOne((float) AntarchyMobsConfig.krakenLightningDamagePhaseOne()); AntarchySettings.setKrakenSquidSpawnEnabled(AntarchyMobsConfig.krakenSquidSpawnEnabled()); AntarchySettings.setKrakenMassSpawnEnabled(AntarchyMobsConfig.krakenMassSpawnEnabled()); AntarchySettings.setKrakenRequireBadOmenToSummon(AntarchyMobsConfig.krakenRequireBadOmenToSummon()); @@ -117,6 +141,11 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setBrutalflySwipeDamage(AntarchyMobsConfig.brutalflySwipeDamage()); AntarchySettings.setBrutalflySpitDamage(AntarchyMobsConfig.brutalflySpitDamage()); AntarchySettings.setBrutalflyDamageRange(AntarchyMobsConfig.brutalflyDamageRange()); + AntarchySettings.setBrutalflyArmor(AntarchyMobsConfig.brutalflyArmor()); + AntarchySettings.setBrutalflyArmorToughness(AntarchyMobsConfig.brutalflyArmorToughness()); + AntarchySettings.setBrutalflyMovementSpeed(AntarchyMobsConfig.brutalflyMovementSpeed()); + AntarchySettings.setBrutalflyFlyingSpeed(AntarchyMobsConfig.brutalflyFlyingSpeed()); + AntarchySettings.setBrutalflyKnockbackResistance(AntarchyMobsConfig.brutalflyKnockbackResistance()); AntarchySettings.setMantisHealth(AntarchyMobsConfig.mantisHealth()); AntarchySettings.setMantisAttackDamage(AntarchyMobsConfig.mantisAttackDamage()); @@ -135,7 +164,6 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setRollyPollyHealth(AntarchyMobsConfig.rollyPollyHealth()); AntarchySettings.setRollyPollyMovementSpeed(AntarchyMobsConfig.rollyPollyMovementSpeed()); AntarchySettings.setRollyPollyRollSpeedMultiplier(AntarchyMobsConfig.rollyPollyRollSpeedMultiplier()); - AntarchySettings.setRollyPollyTumbleDamage(AntarchyMobsConfig.rollyPollyTumbleDamage()); AntarchySettings.setRollyPollyTameChance(AntarchyMobsConfig.rollyPollyTameChance()); AntarchySettings.setRollyPollyBowlingDamage(AntarchyMobsConfig.rollyPollyBowlingDamage()); AntarchySettings.setRollyPollyBowlingKnockback(AntarchyMobsConfig.rollyPollyBowlingKnockback()); @@ -163,6 +191,9 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setNightmareHealth(AntarchyMobsConfig.nightmareHealth()); AntarchySettings.setNightmareAttackDamage(AntarchyMobsConfig.nightmareAttackDamage()); + AntarchySettings.setNightmareMovementSpeed(AntarchyMobsConfig.nightmareMovementSpeed()); + AntarchySettings.setNightmareWeaknessTicks(AntarchyMobsConfig.nightmareWeaknessTicks()); + AntarchySettings.setNightmareDreadTicks(AntarchyMobsConfig.nightmareDreadTicks()); AntarchySettings.setBasiliskPetrifyingGazeEnabled(AntarchyMobsConfig.basiliskPetrifyingGazeEnabled()); AntarchySettings.setBasiliskSpawnMaxLightLevel(AntarchyMobsConfig.basiliskSpawnMaxLightLevel()); @@ -188,6 +219,62 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setLucidAttackRange(AntarchyMobsConfig.lucidAttackRange()); AntarchySettings.setLucidPearlInvertedDurationSeconds(AntarchyMobsConfig.lucidPearlInvertedDurationSeconds()); + AntarchySettings.setLucidHealth(AntarchyMobsConfig.lucidHealth()); + AntarchySettings.setLucidAttackDamage(AntarchyMobsConfig.lucidAttackDamage()); + AntarchySettings.setLucidMovementSpeed(AntarchyMobsConfig.lucidMovementSpeed()); + AntarchySettings.setLucidFlyingSpeed(AntarchyMobsConfig.lucidFlyingSpeed()); + AntarchySettings.setLucidKnockbackResistance(AntarchyMobsConfig.lucidKnockbackResistance()); + + AntarchySettings.setMissileSquidHealth(AntarchyMobsConfig.missileSquidHealth()); + AntarchySettings.setMissileSquidAttackDamage(AntarchyMobsConfig.missileSquidAttackDamage()); + AntarchySettings.setMissileSquidMovementSpeed(AntarchyMobsConfig.missileSquidMovementSpeed()); + AntarchySettings.setMissileSquidFlyingSpeed(AntarchyMobsConfig.missileSquidFlyingSpeed()); + AntarchySettings.setMissileSquidKnockbackResistance(AntarchyMobsConfig.missileSquidKnockbackResistance()); + + AntarchySettings.setOctopusBombHealth(AntarchyMobsConfig.octopusBombHealth()); + AntarchySettings.setOctopusBombAttackDamage(AntarchyMobsConfig.octopusBombAttackDamage()); + + AntarchySettings.setBedBugHealth(AntarchyMobsConfig.bedBugHealth()); + AntarchySettings.setBedBugAttackDamage(AntarchyMobsConfig.bedBugAttackDamage()); + AntarchySettings.setBedBugMovementSpeed(AntarchyMobsConfig.bedBugMovementSpeed()); + AntarchySettings.setBedBugArmor(AntarchyMobsConfig.bedBugArmor()); + + AntarchySettings.setCloudSharkHealth(AntarchyMobsConfig.cloudSharkHealth()); + AntarchySettings.setCloudSharkAttackDamage(AntarchyMobsConfig.cloudSharkAttackDamage()); + AntarchySettings.setCloudSharkMovementSpeed(AntarchyMobsConfig.cloudSharkMovementSpeed()); + AntarchySettings.setCloudSharkFlyingSpeed(AntarchyMobsConfig.cloudSharkFlyingSpeed()); + AntarchySettings.setCloudSharkKnockbackResistance(AntarchyMobsConfig.cloudSharkKnockbackResistance()); + + AntarchySettings.setFlyingSquirrelHealth(AntarchyMobsConfig.flyingSquirrelHealth()); + AntarchySettings.setFlyingSquirrelMovementSpeed(AntarchyMobsConfig.flyingSquirrelMovementSpeed()); + + AntarchySettings.setMolevoreHealth(AntarchyMobsConfig.molevoreHealth()); + AntarchySettings.setMolevoreAttackDamage(AntarchyMobsConfig.molevoreAttackDamage()); + AntarchySettings.setMolevoreMovementSpeed(AntarchyMobsConfig.molevoreMovementSpeed()); + AntarchySettings.setMolevoreArmor(AntarchyMobsConfig.molevoreArmor()); + AntarchySettings.setMolevoreKnockbackResistance(AntarchyMobsConfig.molevoreKnockbackResistance()); + AntarchySettings.setMolevoreFollowRange(AntarchyMobsConfig.molevoreFollowRange()); + AntarchySettings.setMolevoreXpReward(AntarchyMobsConfig.molevoreXpReward()); + AntarchySettings.setMolevoreSpinTicks(AntarchyMobsConfig.molevoreSpinTicks()); + AntarchySettings.setMolevoreCooldownTicks(AntarchyMobsConfig.molevoreCooldownTicks()); + AntarchySettings.setMolevoreChargeSpeed(AntarchyMobsConfig.molevoreChargeSpeed()); + AntarchySettings.setMolevoreBreakRange(AntarchyMobsConfig.molevoreBreakRange()); + AntarchySettings.setMolevoreBreakVerticalRange(AntarchyMobsConfig.molevoreBreakVerticalRange()); + AntarchySettings.setMolevoreBreakHalfWidth(AntarchyMobsConfig.molevoreBreakHalfWidth()); + + AntarchySettings.setMolewormHealth(AntarchyMobsConfig.molewormHealth()); + AntarchySettings.setMolewormAttackDamage(AntarchyMobsConfig.molewormAttackDamage()); + AntarchySettings.setMolewormMovementSpeed(AntarchyMobsConfig.molewormMovementSpeed()); + + AntarchySettings.setScorpionHealth(AntarchyMobsConfig.scorpionHealth()); + AntarchySettings.setScorpionAttackDamage(AntarchyMobsConfig.scorpionAttackDamage()); + AntarchySettings.setScorpionMovementSpeed(AntarchyMobsConfig.scorpionMovementSpeed()); + AntarchySettings.setScorpionArmor(AntarchyMobsConfig.scorpionArmor()); + AntarchySettings.setScorpionKnockbackResistance(AntarchyMobsConfig.scorpionKnockbackResistance()); + + AntarchySettings.setButterflyHealth(AntarchyMobsConfig.butterflyHealth()); + AntarchySettings.setButterflyMovementSpeed(AntarchyMobsConfig.butterflyMovementSpeed()); + AntarchySettings.setButterflyFlyingSpeed(AntarchyMobsConfig.butterflyFlyingSpeed()); AntarchySettings.setDreadHallucinationSoundsEnabled(AntarchyMobsConfig.dreadHallucinationSoundsEnabled()); AntarchySettings.setDreadHallucinationSoundMinInterval(AntarchyMobsConfig.dreadHallucinationSoundMinInterval()); @@ -231,6 +318,8 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setHerculesBeetleDamageRange(AntarchyMobsConfig.herculesBeetleDamageRange()); AntarchySettings.setOuranwoodDeerHealth(AntarchyMobsConfig.ouranwoodDeerHealth()); AntarchySettings.setGlimmerHealth(AntarchyMobsConfig.glimmerHealth()); + + AntarchySettings.setAntDanceRadius(AntarchyMobsConfig.antDanceRadius()); } private static void bakeToolsConfig() { @@ -262,10 +351,6 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setUltimateCrossbowChargeSpeedMultiplier(AntarchyToolsConfig.ultimateCrossbowChargeSpeedMultiplier()); AntarchySettings.setUltimateCrossbowEnchantability(AntarchyToolsConfig.ultimateCrossbowEnchantability()); - AntarchySettings.setUltimateMaceDamageMultiplier(AntarchyToolsConfig.ultimateMaceDamageMultiplier()); - AntarchySettings.setUltimateMaceAttackSpeed(AntarchyToolsConfig.ultimateMaceAttackSpeed()); - AntarchySettings.setUltimateMaceEnchantability(AntarchyToolsConfig.ultimateMaceEnchantability()); - AntarchySettings.setUltimateArmorComesEnchanted(AntarchyToolsConfig.ultimateArmorComesEnchanted()); AntarchySettings.setUltimateArmorEnchantability(AntarchyToolsConfig.ultimateArmorEnchantability()); AntarchySettings.setUltimateHelmetArmorValue(AntarchyToolsConfig.ultimateHelmetArmorValue()); @@ -304,12 +389,9 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setKrakensGraspTentacleSlownessAmplifier(AntarchyToolsConfig.krakensGraspTentacleSlownessAmplifier()); AntarchySettings.setKrakensGraspTentacleSlownessRefreshTicks(AntarchyToolsConfig.krakensGraspTentacleSlownessRefreshTicks()); AntarchySettings.setScorpionWhipBaseDamage(AntarchyToolsConfig.scorpionWhipBaseDamage()); - AntarchySettings.setScorpionWhipReachBonus(AntarchyToolsConfig.scorpionWhipReachBonus()); AntarchySettings.setScorpionWhipPoisonDurationTicks(AntarchyToolsConfig.scorpionWhipPoisonDurationTicks()); AntarchySettings.setScorpionWhipTetherMaxRange(AntarchyToolsConfig.scorpionWhipTetherMaxRange()); - AntarchySettings.setScorpionWhipReelCooldownTicks(AntarchyToolsConfig.scorpionWhipReelCooldownTicks()); AntarchySettings.setScorpionWhipSnapBonusDamage(AntarchyToolsConfig.scorpionWhipSnapBonusDamage()); - AntarchySettings.setScorpionWhipSnapCooldownTicks(AntarchyToolsConfig.scorpionWhipSnapCooldownTicks()); AntarchySettings.setScorpionWhipPullStrength(AntarchyToolsConfig.scorpionWhipPullStrength()); AntarchySettings.setScorpionWhipHeavyPullMultiplier(AntarchyToolsConfig.scorpionWhipHeavyPullMultiplier()); AntarchySettings.setScorpionWhipSelfPullMultiplier(AntarchyToolsConfig.scorpionWhipSelfPullMultiplier()); @@ -326,7 +408,10 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setNightmareLeggingsArmorToughness(AntarchyToolsConfig.nightmareLeggingsArmorToughness()); AntarchySettings.setNightmareBootsArmorToughness(AntarchyToolsConfig.nightmareBootsArmorToughness()); AntarchySettings.setNightmareArmorKnockbackResistance(AntarchyToolsConfig.nightmareArmorKnockbackResistance()); - AntarchySettings.setNightmareArmorDreadAuraRangePerPiece(AntarchyToolsConfig.nightmareArmorDreadAuraRangePerPiece()); + AntarchySettings.setNightmareHelmetDoubleDamageChance(AntarchyToolsConfig.nightmareHelmetDoubleDamageChance()); + AntarchySettings.setNightmareChestplateDoubleDamageChance(AntarchyToolsConfig.nightmareChestplateDoubleDamageChance()); + AntarchySettings.setNightmareLeggingsDoubleDamageChance(AntarchyToolsConfig.nightmareLeggingsDoubleDamageChance()); + AntarchySettings.setNightmareBootsDoubleDamageChance(AntarchyToolsConfig.nightmareBootsDoubleDamageChance()); AntarchySettings.setPrimordialArmorKnockbackPerPiece(AntarchyToolsConfig.primordialArmorKnockbackPerPiece()); AntarchySettings.setNightmareSwordBaseDamage(AntarchyToolsConfig.nightmareSwordBaseDamage()); AntarchySettings.setNightmareSwordAttackSpeed(AntarchyToolsConfig.nightmareSwordAttackSpeed()); @@ -376,11 +461,8 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setAmericanBonusSaturation(AntarchyToolsConfig.americanBonusSaturation()); AntarchySettings.setAmericanRegenerationDurationTicks(AntarchyToolsConfig.americanRegenerationDurationTicks()); AntarchySettings.setAmericanRegenerationAmplifier(AntarchyToolsConfig.americanRegenerationAmplifier()); - AntarchySettings.setAntDanceRadius(AntarchyMobsConfig.antDanceRadius()); AntarchySettings.setMogglesVisionRadius(AntarchyToolsConfig.mogglesVisionRadius()); - AntarchySettings.setMogglesVisionMaxLight(AntarchyToolsConfig.mogglesVisionMaxLight()); - AntarchySettings.setMogglesVisionAlpha(AntarchyToolsConfig.mogglesVisionAlpha()); } private static void bakeMiscConfig() { @@ -411,13 +493,12 @@ public final class AntarchyConfigModuleForge { AntarchySettings.setDreamSandEnabled(AntarchyMiscConfig.dreamSandEnabled()); AntarchySettings.setDreamSandJumpVelocityMultiplier(AntarchyMiscConfig.dreamSandJumpVelocityMultiplier()); AntarchySettings.setDreamSandGravityMultiplier(AntarchyMiscConfig.dreamSandGravityMultiplier()); - AntarchySettings.setDreamSandFallDamageMultiplier(AntarchyMiscConfig.dreamSandFallDamageMultiplier()); + AntarchySettings.setDreamSandFallingBlockGravityMultiplier(AntarchyMiscConfig.dreamSandFallingBlockGravityMultiplier()); AntarchySettings.setDreamSandEffectDurationSeconds(AntarchyMiscConfig.dreamSandEffectDurationSeconds()); AntarchySettings.setIchorWitherEnabled(AntarchyMiscConfig.ichorWitherEnabled()); AntarchySettings.setDuplicatorTreeEnabled(AntarchyMiscConfig.duplicatorTreeEnabled()); - AntarchySettings.setGlowingTorchflowers(AntarchyMiscConfig.glowingTorchflowers()); AntarchySettings.setGlowVinesUnderLeaves(AntarchyMiscConfig.glowVinesUnderLeaves()); AntarchySettings.setSwingThroughGrassEnabled(AntarchyMiscConfig.swingThroughGrassEnabled()); AntarchySettings.setFabricKeybindingConflictFixEnabled(AntarchyMiscConfig.fabricKeybindingConflictFixEnabled()); diff --git a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMiscConfig.java b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMiscConfig.java index 29480d08..dd168c90 100644 --- a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMiscConfig.java +++ b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMiscConfig.java @@ -13,7 +13,7 @@ public final class AntarchyMiscConfig { private static final ForgeConfigSpec.DoubleValue DREAM_SAND_JUMP_VELOCITY_MULTIPLIER; private static final ForgeConfigSpec.DoubleValue DREAM_SAND_GRAVITY_MULTIPLIER; private static final ForgeConfigSpec.DoubleValue DREAM_SAND_EFFECT_DURATION_SECONDS; - private static final ForgeConfigSpec.DoubleValue DREAM_SAND_FALL_DAMAGE_MULTIPLIER; + private static final ForgeConfigSpec.DoubleValue DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER; // Ichor private static final ForgeConfigSpec.BooleanValue ICHOR_WITHER_ENABLED; @@ -47,7 +47,6 @@ public final class AntarchyMiscConfig { // World / misc toggles private static final ForgeConfigSpec.BooleanValue DUPLICATOR_TREE_ENABLED; private static final ForgeConfigSpec.BooleanValue GLOW_VINES_UNDER_LEAVES; - private static final ForgeConfigSpec.BooleanValue GLOWING_TORCHFLOWERS; private static final ForgeConfigSpec.BooleanValue SWING_THROUGH_GRASS_ENABLED; private static final ForgeConfigSpec.BooleanValue FABRIC_KEYBINDING_CONFLICT_FIX_ENABLED; private static final ForgeConfigSpec.BooleanValue EXPERIMENTAL_SETTINGS_POPUP_DISABLED; @@ -73,7 +72,7 @@ public final class AntarchyMiscConfig { DREAM_SAND_JUMP_VELOCITY_MULTIPLIER = b.comment("Multiplier applied to upward jump velocity when leaving dream sand.") .defineInRange("jumpVelocityMultiplier", 1.3D, 0.0D, 16.0D); DREAM_SAND_GRAVITY_MULTIPLIER = b.comment("Multiplier applied to downward velocity while low gravity is active.") .defineInRange("gravityMultiplier", 0.45D, 0.0D, 1.0D); DREAM_SAND_EFFECT_DURATION_SECONDS = b.comment("Seconds the low-gravity effect remains active after leaving dream sand.") .defineInRange("effectDurationSeconds", 7.0D, 0.0D, 60.0D); - DREAM_SAND_FALL_DAMAGE_MULTIPLIER = b.comment("Multiplier applied to fall damage after dream sand low gravity.").defineInRange("fallDamageMultiplier", 0.4D, 0.0D, 16.0D); + DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER = b.comment("Multiplier applied to dream sand's own falling-block gravity (how slowly it falls as a block, distinct from the player low-gravity effect).").defineInRange("fallingBlockGravityMultiplier", 0.4D, 0.0D, 16.0D); b.pop(); @@ -147,7 +146,6 @@ public final class AntarchyMiscConfig { 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); - GLOWING_TORCHFLOWERS = b.comment("If true, torchflowers use the glowing behavior.").define("glowingTorchflowers", true); SWING_THROUGH_GRASS_ENABLED = b.comment("If true, empty collision plants like grass do not block melee target picking.") .define("swingThroughGrassEnabled", true); FABRIC_KEYBINDING_CONFLICT_FIX_ENABLED = b.define("fabricKeybindingConflictFixEnabled", true); EXPERIMENTAL_SETTINGS_POPUP_DISABLED = b.define("experimentalSettingsPopupDisabled", true); @@ -165,13 +163,12 @@ public final class AntarchyMiscConfig { static double dreamSandJumpVelocityMultiplier() { return DREAM_SAND_JUMP_VELOCITY_MULTIPLIER.get(); } static double dreamSandGravityMultiplier() { return DREAM_SAND_GRAVITY_MULTIPLIER.get(); } static double dreamSandEffectDurationSeconds() { return DREAM_SAND_EFFECT_DURATION_SECONDS.get(); } - static double dreamSandFallDamageMultiplier() { return DREAM_SAND_FALL_DAMAGE_MULTIPLIER.get(); } + static double dreamSandFallingBlockGravityMultiplier() { return DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER.get(); } static boolean ichorWitherEnabled() { return ICHOR_WITHER_ENABLED.get(); } static boolean duplicatorTreeEnabled() { return DUPLICATOR_TREE_ENABLED.get(); } static boolean glowVinesUnderLeaves() { return GLOW_VINES_UNDER_LEAVES.get(); } - static boolean glowingTorchflowers() { return GLOWING_TORCHFLOWERS.get(); } static boolean swingThroughGrassEnabled() { return SWING_THROUGH_GRASS_ENABLED.get(); } static boolean fabricKeybindingConflictFixEnabled() { return FABRIC_KEYBINDING_CONFLICT_FIX_ENABLED.get(); } static boolean experimentalSettingsPopupDisabled() { return EXPERIMENTAL_SETTINGS_POPUP_DISABLED.get(); } diff --git a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMobsConfig.java b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMobsConfig.java index d5a5cb75..f7eb04eb 100644 --- a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMobsConfig.java +++ b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyMobsConfig.java @@ -71,6 +71,25 @@ public final class AntarchyMobsConfig { // Emperor Scorpion + private static final ForgeConfigSpec.DoubleValue EMPEROR_SCORPION_HEALTH; + private static final ForgeConfigSpec.DoubleValue EMPEROR_SCORPION_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue EMPEROR_SCORPION_ARMOR; + private static final ForgeConfigSpec.DoubleValue EMPEROR_SCORPION_KNOCKBACK_RESISTANCE; + private static final ForgeConfigSpec.DoubleValue EMPEROR_SCORPION_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue EMPEROR_SCORPION_FOLLOW_RANGE; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_XP_REWARD; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_CLAW_ANIM_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_CLAW_HIT_TICK; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_CLAW_COOLDOWN_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_STING_ANIM_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_STING_HIT_TICK; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_STING_COOLDOWN_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_POISON_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_WEAKNESS_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_HARDEN_COOLDOWN_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_SUMMON_INTERVAL_TICKS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_MAX_SUMMONED_SCORPIONS; + private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_MAX_NEARBY_SCORPIONS; private static final ForgeConfigSpec.DoubleValue EMPEROR_SCORPION_DAMAGE_RANGE; private static final ForgeConfigSpec.IntValue EMPEROR_SCORPION_MIN_DESPAWN_TICKS; @@ -79,7 +98,12 @@ public final class AntarchyMobsConfig { private static final ForgeConfigSpec.DoubleValue KRAKEN_HEALTH; private static final ForgeConfigSpec.DoubleValue KRAKEN_ATTACK_DAMAGE; - private static final ForgeConfigSpec.DoubleValue KRAKEN_PROJECTILE_DAMAGE_TAKEN_MULTIPLIER; + private static final ForgeConfigSpec.DoubleValue KRAKEN_ARMOR; + private static final ForgeConfigSpec.DoubleValue KRAKEN_KNOCKBACK_RESISTANCE; + private static final ForgeConfigSpec.DoubleValue KRAKEN_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue KRAKEN_FLYING_SPEED; + private static final ForgeConfigSpec.DoubleValue KRAKEN_BOSS_BAR_RANGE; + private static final ForgeConfigSpec.DoubleValue KRAKEN_LIGHTNING_DAMAGE_PHASE_ONE; private static final ForgeConfigSpec.BooleanValue KRAKEN_SQUID_SPAWN_ENABLED; private static final ForgeConfigSpec.BooleanValue KRAKEN_MASS_SPAWN_ENABLED; private static final ForgeConfigSpec.BooleanValue KRAKEN_REQUIRE_BAD_OMEN_TO_SUMMON; @@ -93,6 +117,11 @@ public final class AntarchyMobsConfig { private static final ForgeConfigSpec.DoubleValue BRUTALFLY_SWIPE_DAMAGE; private static final ForgeConfigSpec.DoubleValue BRUTALFLY_SPIT_DAMAGE; private static final ForgeConfigSpec.DoubleValue BRUTALFLY_DAMAGE_RANGE; + private static final ForgeConfigSpec.DoubleValue BRUTALFLY_ARMOR; + private static final ForgeConfigSpec.DoubleValue BRUTALFLY_ARMOR_TOUGHNESS; + private static final ForgeConfigSpec.DoubleValue BRUTALFLY_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue BRUTALFLY_FLYING_SPEED; + private static final ForgeConfigSpec.DoubleValue BRUTALFLY_KNOCKBACK_RESISTANCE; // Mantis @@ -122,7 +151,6 @@ public final class AntarchyMobsConfig { private static final ForgeConfigSpec.DoubleValue ROLLY_POLLY_ROLL_SPEED_MULTIPLIER; private static final ForgeConfigSpec.IntValue ROLLY_POLLY_TAME_CHANCE; private static final ForgeConfigSpec.DoubleValue ROLLY_POLLY_BOWLING_DAMAGE; - private static final ForgeConfigSpec.DoubleValue ROLLY_POLLY_TUMBLE_DAMAGE; private static final ForgeConfigSpec.DoubleValue ROLLY_POLLY_BOWLING_KNOCKBACK; private static final ForgeConfigSpec.DoubleValue ROLLY_POLLY_ARMOR; private static final ForgeConfigSpec.DoubleValue ROLLY_POLLY_ROLLED_ARMOR_BONUS; @@ -165,6 +193,9 @@ public final class AntarchyMobsConfig { private static final ForgeConfigSpec.DoubleValue NIGHTMARE_HEALTH; private static final ForgeConfigSpec.DoubleValue NIGHTMARE_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue NIGHTMARE_MOVEMENT_SPEED; + private static final ForgeConfigSpec.IntValue NIGHTMARE_WEAKNESS_TICKS; + private static final ForgeConfigSpec.IntValue NIGHTMARE_DREAD_TICKS; // Basilisk @@ -265,6 +296,89 @@ public final class AntarchyMobsConfig { private static final ForgeConfigSpec.DoubleValue LUCID_ATTACK_RANGE; private static final ForgeConfigSpec.DoubleValue LUCID_PEARL_INVERTED_DURATION_SECONDS; + private static final ForgeConfigSpec.DoubleValue LUCID_HEALTH; + private static final ForgeConfigSpec.DoubleValue LUCID_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue LUCID_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue LUCID_FLYING_SPEED; + private static final ForgeConfigSpec.DoubleValue LUCID_KNOCKBACK_RESISTANCE; + + + // Missile Squid + + private static final ForgeConfigSpec.DoubleValue MISSILE_SQUID_HEALTH; + private static final ForgeConfigSpec.DoubleValue MISSILE_SQUID_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue MISSILE_SQUID_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue MISSILE_SQUID_FLYING_SPEED; + private static final ForgeConfigSpec.DoubleValue MISSILE_SQUID_KNOCKBACK_RESISTANCE; + + + // Octopus Bomb + + private static final ForgeConfigSpec.DoubleValue OCTOPUS_BOMB_HEALTH; + private static final ForgeConfigSpec.DoubleValue OCTOPUS_BOMB_ATTACK_DAMAGE; + + + // Bed Bug + + private static final ForgeConfigSpec.DoubleValue BED_BUG_HEALTH; + private static final ForgeConfigSpec.DoubleValue BED_BUG_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue BED_BUG_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue BED_BUG_ARMOR; + + + // Cloud Shark + + private static final ForgeConfigSpec.DoubleValue CLOUD_SHARK_HEALTH; + private static final ForgeConfigSpec.DoubleValue CLOUD_SHARK_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue CLOUD_SHARK_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue CLOUD_SHARK_FLYING_SPEED; + private static final ForgeConfigSpec.DoubleValue CLOUD_SHARK_KNOCKBACK_RESISTANCE; + + + // Flying Squirrel + + private static final ForgeConfigSpec.DoubleValue FLYING_SQUIRREL_HEALTH; + private static final ForgeConfigSpec.DoubleValue FLYING_SQUIRREL_MOVEMENT_SPEED; + + + // Molevore + + private static final ForgeConfigSpec.DoubleValue MOLEVORE_HEALTH; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_ARMOR; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_KNOCKBACK_RESISTANCE; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_FOLLOW_RANGE; + private static final ForgeConfigSpec.IntValue MOLEVORE_XP_REWARD; + private static final ForgeConfigSpec.IntValue MOLEVORE_SPIN_TICKS; + private static final ForgeConfigSpec.IntValue MOLEVORE_COOLDOWN_TICKS; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_CHARGE_SPEED; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_BREAK_RANGE; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_BREAK_VERTICAL_RANGE; + private static final ForgeConfigSpec.DoubleValue MOLEVORE_BREAK_HALF_WIDTH; + + + // Moleworm + + private static final ForgeConfigSpec.DoubleValue MOLEWORM_HEALTH; + private static final ForgeConfigSpec.DoubleValue MOLEWORM_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue MOLEWORM_MOVEMENT_SPEED; + + + // Scorpion + + private static final ForgeConfigSpec.DoubleValue SCORPION_HEALTH; + private static final ForgeConfigSpec.DoubleValue SCORPION_ATTACK_DAMAGE; + private static final ForgeConfigSpec.DoubleValue SCORPION_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue SCORPION_ARMOR; + private static final ForgeConfigSpec.DoubleValue SCORPION_KNOCKBACK_RESISTANCE; + + + // Butterfly + + private static final ForgeConfigSpec.DoubleValue BUTTERFLY_HEALTH; + private static final ForgeConfigSpec.DoubleValue BUTTERFLY_MOVEMENT_SPEED; + private static final ForgeConfigSpec.DoubleValue BUTTERFLY_FLYING_SPEED; // Dread effect @@ -413,6 +527,25 @@ public final class AntarchyMobsConfig { // 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); + EMPEROR_SCORPION_ARMOR = b.comment("Base armor value.") .defineInRange("armor", 22.0D, 0.0D, 1024.0D); + EMPEROR_SCORPION_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.") .defineInRange("knockbackResistance", 0.8D, 0.0D, 1.0D); + EMPEROR_SCORPION_MOVEMENT_SPEED = b.comment("Base movement speed.") .defineInRange("movementSpeed", 0.384D, 0.0D, 10.0D); + EMPEROR_SCORPION_FOLLOW_RANGE = b.comment("Base follow range.") .defineInRange("followRange", 80.0D, 1.0D, 256.0D); + EMPEROR_SCORPION_XP_REWARD = b.comment("Base experience reward.") .defineInRange("xpReward", 25, 0, 100000); + EMPEROR_SCORPION_CLAW_ANIM_TICKS = b.comment("Ticks for the claw attack animation window.") .defineInRange("clawAnimTicks", 23, 1, 400); + EMPEROR_SCORPION_CLAW_HIT_TICK = b.comment("Tick during the claw animation when damage is applied.").defineInRange("clawHitTick", 12, 0, 400); + EMPEROR_SCORPION_CLAW_COOLDOWN_TICKS = b.comment("Cooldown between claw attacks.") .defineInRange("clawCooldownTicks", 28, 0, 20000); + EMPEROR_SCORPION_STING_ANIM_TICKS = b.comment("Ticks for the sting attack animation window.") .defineInRange("stingAnimTicks", 25, 1, 400); + EMPEROR_SCORPION_STING_HIT_TICK = b.comment("Tick during the sting animation when damage is applied.").defineInRange("stingHitTick", 13, 0, 400); + EMPEROR_SCORPION_STING_COOLDOWN_TICKS = b.comment("Cooldown between sting attacks.") .defineInRange("stingCooldownTicks", 60, 0, 20000); + EMPEROR_SCORPION_POISON_TICKS = b.comment("Poison duration applied by the sting attack.") .defineInRange("poisonTicks", 300, 0, 20000); + EMPEROR_SCORPION_WEAKNESS_TICKS = b.comment("Weakness duration applied by the sting attack.") .defineInRange("weaknessTicks", 120, 0, 20000); + EMPEROR_SCORPION_SUMMON_INTERVAL_TICKS = b.comment("Ticks between minion scorpion summons while in combat.").defineInRange("summonIntervalTicks", 140, 20, 72000); + EMPEROR_SCORPION_MAX_SUMMONED_SCORPIONS = b.comment("Maximum scorpions summoned by the Emperor Scorpion at once.").defineInRange("maxSummonedScorpions", 4, 0, 32); + EMPEROR_SCORPION_MAX_NEARBY_SCORPIONS = b.comment("Maximum nearby scorpions allowed before summoning stops.").defineInRange("maxNearbyScorpions", 3, 0, 32); + EMPEROR_SCORPION_HARDEN_COOLDOWN_TICKS = b.comment("Cooldown before the Emperor Scorpion can harden its shell again.").defineInRange("hardenCooldownTicks", 2400, 0, 72000); EMPEROR_SCORPION_DAMAGE_RANGE = b .comment("Range in blocks a player must be within for the Emperor Scorpion to be able to take damage. Prevents cheesing it from outside its aggro range.") .defineInRange("damageRange", 80.0D, 1.0D, 256.0D); @@ -427,7 +560,12 @@ public final class AntarchyMobsConfig { 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); - KRAKEN_PROJECTILE_DAMAGE_TAKEN_MULTIPLIER = b.comment("Multiplier applied to projectile damage taken by the Kraken.").defineInRange("projectileDamageTakenMultiplier", 0.5D, 0.0D, 16.0D); + KRAKEN_ARMOR = b.comment("Base armor value.") .defineInRange("armor", 8.0D, 0.0D, 1024.0D); + KRAKEN_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.") .defineInRange("knockbackResistance", 0.8D, 0.0D, 1.0D); + KRAKEN_MOVEMENT_SPEED = b.comment("Base movement speed.") .defineInRange("movementSpeed", 0.24D, 0.0D, 10.0D); + KRAKEN_FLYING_SPEED = b.comment("Base flying speed.") .defineInRange("flyingSpeed", 0.24D, 0.0D, 10.0D); + KRAKEN_BOSS_BAR_RANGE = b.comment("Range in blocks players see the Kraken's boss bar.") .defineInRange("bossBarRange", 40.0D, 1.0D, 256.0D); + KRAKEN_LIGHTNING_DAMAGE_PHASE_ONE = b.comment("Lightning strike damage dealt during phase one.") .defineInRange("lightningDamagePhaseOne", 6.0D, 0.0D, 1024.0D); KRAKEN_SQUID_SPAWN_ENABLED = b.comment("If true, a player killing a Missile Squid has a 1/100 chance to spawn a single Kraken nearby.") .define("squidSpawnEnabled", true); KRAKEN_MASS_SPAWN_ENABLED = b.comment("If true, a player killing a Missile Squid has a 1/500 chance to spawn 10 Krakens. Independent from the single spawn.").define("massSpawnEnabled", true); KRAKEN_REQUIRE_BAD_OMEN_TO_SUMMON = b.comment("If true, the killer must have Bad Omen to summon a single Kraken; chance scales with Bad Omen level. Mass spawn is unaffected by level but still requires Bad Omen when this is on.").define("requireBadOmenToSummon", true); @@ -443,6 +581,11 @@ public final class AntarchyMobsConfig { BRUTALFLY_SWIPE_DAMAGE = b.comment("Damage dealt by a claw swipe.") .defineInRange("swipeDamage", 15.0D, 0.0D, 1024.0D); BRUTALFLY_SPIT_DAMAGE = b.comment("Direct hit damage from a spit orb before lingering effect.").defineInRange("spitDamage", 5.0D, 0.0D, 1024.0D); BRUTALFLY_DAMAGE_RANGE = b.comment("Range in blocks a player must be within for the Brutalfly to be able to take damage. Prevents cheesing it from outside its aggro range.").defineInRange("damageRange", 48.0D, 1.0D, 256.0D); + BRUTALFLY_ARMOR = b.comment("Base armor value.").defineInRange("armor", 10.0D, 0.0D, 1024.0D); + BRUTALFLY_ARMOR_TOUGHNESS = b.comment("Base armor toughness.").defineInRange("armorToughness", 4.0D, 0.0D, 100.0D); + BRUTALFLY_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.34D, 0.0D, 10.0D); + BRUTALFLY_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.55D, 0.0D, 10.0D); + BRUTALFLY_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.7D, 0.0D, 1.0D); b.pop(); @@ -478,7 +621,6 @@ public final class AntarchyMobsConfig { ROLLY_POLLY_ROLL_SPEED_MULTIPLIER = b.comment("Speed multiplier while rolled up.") .defineInRange("rollSpeedMultiplier", 2.2D, 0.1D, 20.0D); ROLLY_POLLY_TAME_CHANCE = b.comment("Taming succeeds with a 1-in-N chance per food item.") .defineInRange("tameChance", 3, 1, 100); ROLLY_POLLY_BOWLING_DAMAGE = b.comment("Damage dealt by a tamed rolly polly's rolling bowling attack.") .defineInRange("bowlingDamage", 3.0D, 0.0D, 1024.0D); - ROLLY_POLLY_TUMBLE_DAMAGE = b.comment("Damage dealt by a tumbling rolly polly impact.").defineInRange("tumbleDamage", 3.0D, 0.0D, 1024.0D); ROLLY_POLLY_BOWLING_KNOCKBACK = b.comment("Knockback strength of a tamed rolly polly's rolling bowling attack.") .defineInRange("bowlingKnockback", 0.8D, 0.0D, 20.0D); ROLLY_POLLY_ARMOR = b.comment("Base armor value.") .defineInRange("armor", 2.0D, 0.0D, 100.0D); ROLLY_POLLY_ROLLED_ARMOR_BONUS = b.comment("Additional armor gained while rolled up.") .defineInRange("rolledArmorBonus", 16.0D, 0.0D, 100.0D); @@ -534,6 +676,9 @@ public final class AntarchyMobsConfig { 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); + NIGHTMARE_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.28D, 0.0D, 10.0D); + NIGHTMARE_WEAKNESS_TICKS = b.comment("Weakness duration applied on hit.").defineInRange("weaknessTicks", 100, 0, 20000); + NIGHTMARE_DREAD_TICKS = b.comment("Dread duration applied on hit.").defineInRange("dreadTicks", 160, 0, 20000); b.pop(); @@ -577,6 +722,107 @@ public final class AntarchyMobsConfig { LUCID_PEARL_INVERTED_DURATION_SECONDS = b .comment("How long the Inverted effect from a Lucid pearl lasts, in seconds.") .defineInRange("pearlInvertedDurationSeconds", 6.0D, 0.0D, 3600.0D); + LUCID_HEALTH = b.comment("Base max health.").defineInRange("health", 30.0D, 1.0D, 32768.0D); + LUCID_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 4.0D, 0.0D, 1024.0D); + LUCID_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.22D, 0.0D, 10.0D); + LUCID_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.35D, 0.0D, 10.0D); + LUCID_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.5D, 0.0D, 1.0D); + b.pop(); + + + // Missile Squid + + b.push("missileSquid"); + MISSILE_SQUID_HEALTH = b.comment("Base max health.").defineInRange("health", 50.0D, 1.0D, 32768.0D); + MISSILE_SQUID_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 6.0D, 0.0D, 1024.0D); + MISSILE_SQUID_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.84D, 0.0D, 10.0D); + MISSILE_SQUID_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.84D, 0.0D, 10.0D); + MISSILE_SQUID_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.15D, 0.0D, 1.0D); + b.pop(); + + + // Octopus Bomb + + b.push("octopusBomb"); + OCTOPUS_BOMB_HEALTH = b.comment("Base max health.").defineInRange("health", 100.0D, 1.0D, 32768.0D); + OCTOPUS_BOMB_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 16.0D, 0.0D, 1024.0D); + b.pop(); + + + // Bed Bug + + b.push("bedBug"); + BED_BUG_HEALTH = b.comment("Base max health.").defineInRange("health", 18.0D, 1.0D, 32768.0D); + BED_BUG_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 4.0D, 0.0D, 1024.0D); + BED_BUG_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.24D, 0.0D, 10.0D); + BED_BUG_ARMOR = b.comment("Base armor value.").defineInRange("armor", 2.0D, 0.0D, 1024.0D); + b.pop(); + + + // Cloud Shark + + b.push("cloudShark"); + CLOUD_SHARK_HEALTH = b.comment("Base max health.").defineInRange("health", 40.0D, 1.0D, 32768.0D); + CLOUD_SHARK_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 5.0D, 0.0D, 1024.0D); + CLOUD_SHARK_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.34D, 0.0D, 10.0D); + CLOUD_SHARK_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.5D, 0.0D, 10.0D); + CLOUD_SHARK_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.2D, 0.0D, 1.0D); + b.pop(); + + + // Flying Squirrel + + b.push("flyingSquirrel"); + FLYING_SQUIRREL_HEALTH = b.comment("Base max health.").defineInRange("health", 10.0D, 1.0D, 32768.0D); + FLYING_SQUIRREL_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.35D, 0.0D, 10.0D); + b.pop(); + + + // Molevore + + b.push("molevore"); + MOLEVORE_HEALTH = b.comment("Base max health.").defineInRange("health", 60.0D, 1.0D, 32768.0D); + MOLEVORE_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 10.0D, 0.0D, 1024.0D); + MOLEVORE_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.27D, 0.0D, 10.0D); + MOLEVORE_ARMOR = b.comment("Base armor value.").defineInRange("armor", 6.0D, 0.0D, 1024.0D); + MOLEVORE_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.65D, 0.0D, 1.0D); + MOLEVORE_FOLLOW_RANGE = b.comment("Base follow range.").defineInRange("followRange", 28.0D, 1.0D, 256.0D); + MOLEVORE_XP_REWARD = b.comment("Base experience reward.").defineInRange("xpReward", 20, 0, 100000); + MOLEVORE_SPIN_TICKS = b.comment("Ticks the Molevore spins before charging.").defineInRange("spinTicks", 12, 0, 400); + MOLEVORE_COOLDOWN_TICKS = b.comment("Cooldown between charge attacks.").defineInRange("cooldownTicks", 60, 0, 20000); + MOLEVORE_CHARGE_SPEED = b.comment("Speed multiplier while charging.").defineInRange("chargeSpeed", 1.15D, 0.0D, 20.0D); + MOLEVORE_BREAK_RANGE = b.comment("Forward range in blocks for breaking blocks while charging.").defineInRange("breakRange", 1.8D, 0.0D, 32.0D); + MOLEVORE_BREAK_VERTICAL_RANGE = b.comment("Vertical range in blocks for breaking blocks while charging.").defineInRange("breakVerticalRange", 2.2D, 0.0D, 32.0D); + MOLEVORE_BREAK_HALF_WIDTH = b.comment("Half-width in blocks for breaking blocks while charging.").defineInRange("breakHalfWidth", 1.1D, 0.0D, 16.0D); + b.pop(); + + + // Moleworm + + b.push("moleworm"); + MOLEWORM_HEALTH = b.comment("Base max health.").defineInRange("health", 8.0D, 1.0D, 32768.0D); + MOLEWORM_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 1.0D, 0.0D, 1024.0D); + MOLEWORM_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.25D, 0.0D, 10.0D); + b.pop(); + + + // Scorpion + + b.push("scorpion"); + SCORPION_HEALTH = b.comment("Base max health.").defineInRange("health", 30.0D, 1.0D, 32768.0D); + SCORPION_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 5.0D, 0.0D, 1024.0D); + SCORPION_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.29D, 0.0D, 10.0D); + SCORPION_ARMOR = b.comment("Base armor value.").defineInRange("armor", 2.0D, 0.0D, 1024.0D); + SCORPION_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.2D, 0.0D, 1.0D); + b.pop(); + + + // Butterfly + + b.push("butterfly"); + BUTTERFLY_HEALTH = b.comment("Base max health.").defineInRange("health", 6.0D, 1.0D, 32768.0D); + BUTTERFLY_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.3D, 0.0D, 10.0D); + BUTTERFLY_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.55D, 0.0D, 10.0D); b.pop(); @@ -716,12 +962,36 @@ public final class AntarchyMobsConfig { static double jumpyBugLatchDamage() { return JUMPY_BUG_LATCH_DAMAGE.get(); } static double jumpyBugCamouflageAlpha() { return JUMPY_BUG_CAMOUFLAGE_ALPHA.get(); } + static double emperorScorpionHealth() { return EMPEROR_SCORPION_HEALTH.get(); } + static double emperorScorpionAttackDamage() { return EMPEROR_SCORPION_ATTACK_DAMAGE.get(); } + static double emperorScorpionArmor() { return EMPEROR_SCORPION_ARMOR.get(); } + static double emperorScorpionKnockbackResistance() { return EMPEROR_SCORPION_KNOCKBACK_RESISTANCE.get(); } + static double emperorScorpionMovementSpeed() { return EMPEROR_SCORPION_MOVEMENT_SPEED.get(); } + static double emperorScorpionFollowRange() { return EMPEROR_SCORPION_FOLLOW_RANGE.get(); } + static int emperorScorpionXpReward() { return EMPEROR_SCORPION_XP_REWARD.get(); } + static int emperorScorpionClawAnimTicks() { return EMPEROR_SCORPION_CLAW_ANIM_TICKS.get(); } + static int emperorScorpionClawHitTick() { return EMPEROR_SCORPION_CLAW_HIT_TICK.get(); } + static int emperorScorpionClawCooldownTicks() { return EMPEROR_SCORPION_CLAW_COOLDOWN_TICKS.get(); } + static int emperorScorpionStingAnimTicks() { return EMPEROR_SCORPION_STING_ANIM_TICKS.get(); } + static int emperorScorpionStingHitTick() { return EMPEROR_SCORPION_STING_HIT_TICK.get(); } + static int emperorScorpionStingCooldownTicks() { return EMPEROR_SCORPION_STING_COOLDOWN_TICKS.get(); } + static int emperorScorpionPoisonTicks() { return EMPEROR_SCORPION_POISON_TICKS.get(); } + static int emperorScorpionWeaknessTicks() { return EMPEROR_SCORPION_WEAKNESS_TICKS.get(); } + static int emperorScorpionSummonIntervalTicks() { return EMPEROR_SCORPION_SUMMON_INTERVAL_TICKS.get(); } + static int emperorScorpionMaxSummonedScorpions() { return EMPEROR_SCORPION_MAX_SUMMONED_SCORPIONS.get(); } + static int emperorScorpionMaxNearbyScorpions() { return EMPEROR_SCORPION_MAX_NEARBY_SCORPIONS.get(); } + static int emperorScorpionHardenCooldownTicks() { return EMPEROR_SCORPION_HARDEN_COOLDOWN_TICKS.get(); } static double emperorScorpionDamageRange() { return EMPEROR_SCORPION_DAMAGE_RANGE.get(); } static int emperorScorpionMinDespawnTicks() { return EMPEROR_SCORPION_MIN_DESPAWN_TICKS.get(); } static double krakenHealth() { return KRAKEN_HEALTH.get(); } static double krakenAttackDamage() { return KRAKEN_ATTACK_DAMAGE.get(); } - static double krakenProjectileDamageTakenMultiplier() { return KRAKEN_PROJECTILE_DAMAGE_TAKEN_MULTIPLIER.get(); } + static double krakenArmor() { return KRAKEN_ARMOR.get(); } + static double krakenKnockbackResistance() { return KRAKEN_KNOCKBACK_RESISTANCE.get(); } + static double krakenMovementSpeed() { return KRAKEN_MOVEMENT_SPEED.get(); } + static double krakenFlyingSpeed() { return KRAKEN_FLYING_SPEED.get(); } + static double krakenBossBarRange() { return KRAKEN_BOSS_BAR_RANGE.get(); } + static double krakenLightningDamagePhaseOne() { return KRAKEN_LIGHTNING_DAMAGE_PHASE_ONE.get(); } static boolean krakenSquidSpawnEnabled() { return KRAKEN_SQUID_SPAWN_ENABLED.get(); } static boolean krakenMassSpawnEnabled() { return KRAKEN_MASS_SPAWN_ENABLED.get(); } static boolean krakenRequireBadOmenToSummon() { return KRAKEN_REQUIRE_BAD_OMEN_TO_SUMMON.get(); } @@ -732,6 +1002,11 @@ public final class AntarchyMobsConfig { static double brutalflySwipeDamage() { return BRUTALFLY_SWIPE_DAMAGE.get(); } static double brutalflySpitDamage() { return BRUTALFLY_SPIT_DAMAGE.get(); } static double brutalflyDamageRange() { return BRUTALFLY_DAMAGE_RANGE.get(); } + static double brutalflyArmor() { return BRUTALFLY_ARMOR.get(); } + static double brutalflyArmorToughness() { return BRUTALFLY_ARMOR_TOUGHNESS.get(); } + static double brutalflyMovementSpeed() { return BRUTALFLY_MOVEMENT_SPEED.get(); } + static double brutalflyFlyingSpeed() { return BRUTALFLY_FLYING_SPEED.get(); } + static double brutalflyKnockbackResistance() { return BRUTALFLY_KNOCKBACK_RESISTANCE.get(); } static double mantisHealth() { return MANTIS_HEALTH.get(); } static double mantisAttackDamage() { return MANTIS_ATTACK_DAMAGE.get(); } @@ -750,7 +1025,6 @@ public final class AntarchyMobsConfig { static double rollyPollyRollSpeedMultiplier() { return ROLLY_POLLY_ROLL_SPEED_MULTIPLIER.get(); } static int rollyPollyTameChance() { return ROLLY_POLLY_TAME_CHANCE.get(); } static double rollyPollyBowlingDamage() { return ROLLY_POLLY_BOWLING_DAMAGE.get(); } - static double rollyPollyTumbleDamage() { return ROLLY_POLLY_TUMBLE_DAMAGE.get(); } static double rollyPollyBowlingKnockback() { return ROLLY_POLLY_BOWLING_KNOCKBACK.get(); } static double rollyPollyArmor() { return ROLLY_POLLY_ARMOR.get(); } static double rollyPollyRolledArmorBonus() { return ROLLY_POLLY_ROLLED_ARMOR_BONUS.get(); } @@ -777,6 +1051,9 @@ public final class AntarchyMobsConfig { static double nightmareHealth() { return NIGHTMARE_HEALTH.get(); } static double nightmareAttackDamage() { return NIGHTMARE_ATTACK_DAMAGE.get(); } + static double nightmareMovementSpeed() { return NIGHTMARE_MOVEMENT_SPEED.get(); } + static int nightmareWeaknessTicks() { return NIGHTMARE_WEAKNESS_TICKS.get(); } + static int nightmareDreadTicks() { return NIGHTMARE_DREAD_TICKS.get(); } static boolean basiliskPetrifyingGazeEnabled() { return BASILISK_PETRIFYING_GAZE_ENABLED.get(); } static int basiliskSpawnMaxLightLevel() { return BASILISK_SPAWN_MAX_LIGHT_LEVEL.get(); } @@ -802,6 +1079,62 @@ public final class AntarchyMobsConfig { static double lucidAttackRange() { return LUCID_ATTACK_RANGE.get(); } static double lucidPearlInvertedDurationSeconds() { return LUCID_PEARL_INVERTED_DURATION_SECONDS.get(); } + static double lucidHealth() { return LUCID_HEALTH.get(); } + static double lucidAttackDamage() { return LUCID_ATTACK_DAMAGE.get(); } + static double lucidMovementSpeed() { return LUCID_MOVEMENT_SPEED.get(); } + static double lucidFlyingSpeed() { return LUCID_FLYING_SPEED.get(); } + static double lucidKnockbackResistance() { return LUCID_KNOCKBACK_RESISTANCE.get(); } + + static double missileSquidHealth() { return MISSILE_SQUID_HEALTH.get(); } + static double missileSquidAttackDamage() { return MISSILE_SQUID_ATTACK_DAMAGE.get(); } + static double missileSquidMovementSpeed() { return MISSILE_SQUID_MOVEMENT_SPEED.get(); } + static double missileSquidFlyingSpeed() { return MISSILE_SQUID_FLYING_SPEED.get(); } + static double missileSquidKnockbackResistance() { return MISSILE_SQUID_KNOCKBACK_RESISTANCE.get(); } + + static double octopusBombHealth() { return OCTOPUS_BOMB_HEALTH.get(); } + static double octopusBombAttackDamage() { return OCTOPUS_BOMB_ATTACK_DAMAGE.get(); } + + static double bedBugHealth() { return BED_BUG_HEALTH.get(); } + static double bedBugAttackDamage() { return BED_BUG_ATTACK_DAMAGE.get(); } + static double bedBugMovementSpeed() { return BED_BUG_MOVEMENT_SPEED.get(); } + static double bedBugArmor() { return BED_BUG_ARMOR.get(); } + + static double cloudSharkHealth() { return CLOUD_SHARK_HEALTH.get(); } + static double cloudSharkAttackDamage() { return CLOUD_SHARK_ATTACK_DAMAGE.get(); } + static double cloudSharkMovementSpeed() { return CLOUD_SHARK_MOVEMENT_SPEED.get(); } + static double cloudSharkFlyingSpeed() { return CLOUD_SHARK_FLYING_SPEED.get(); } + static double cloudSharkKnockbackResistance() { return CLOUD_SHARK_KNOCKBACK_RESISTANCE.get(); } + + static double flyingSquirrelHealth() { return FLYING_SQUIRREL_HEALTH.get(); } + static double flyingSquirrelMovementSpeed() { return FLYING_SQUIRREL_MOVEMENT_SPEED.get(); } + + static double molevoreHealth() { return MOLEVORE_HEALTH.get(); } + static double molevoreAttackDamage() { return MOLEVORE_ATTACK_DAMAGE.get(); } + static double molevoreMovementSpeed() { return MOLEVORE_MOVEMENT_SPEED.get(); } + static double molevoreArmor() { return MOLEVORE_ARMOR.get(); } + static double molevoreKnockbackResistance() { return MOLEVORE_KNOCKBACK_RESISTANCE.get(); } + static double molevoreFollowRange() { return MOLEVORE_FOLLOW_RANGE.get(); } + static int molevoreXpReward() { return MOLEVORE_XP_REWARD.get(); } + static int molevoreSpinTicks() { return MOLEVORE_SPIN_TICKS.get(); } + static int molevoreCooldownTicks() { return MOLEVORE_COOLDOWN_TICKS.get(); } + static double molevoreChargeSpeed() { return MOLEVORE_CHARGE_SPEED.get(); } + static double molevoreBreakRange() { return MOLEVORE_BREAK_RANGE.get(); } + static double molevoreBreakVerticalRange() { return MOLEVORE_BREAK_VERTICAL_RANGE.get(); } + static double molevoreBreakHalfWidth() { return MOLEVORE_BREAK_HALF_WIDTH.get(); } + + static double molewormHealth() { return MOLEWORM_HEALTH.get(); } + static double molewormAttackDamage() { return MOLEWORM_ATTACK_DAMAGE.get(); } + static double molewormMovementSpeed() { return MOLEWORM_MOVEMENT_SPEED.get(); } + + static double scorpionHealth() { return SCORPION_HEALTH.get(); } + static double scorpionAttackDamage() { return SCORPION_ATTACK_DAMAGE.get(); } + static double scorpionMovementSpeed() { return SCORPION_MOVEMENT_SPEED.get(); } + static double scorpionArmor() { return SCORPION_ARMOR.get(); } + static double scorpionKnockbackResistance() { return SCORPION_KNOCKBACK_RESISTANCE.get(); } + + static double butterflyHealth() { return BUTTERFLY_HEALTH.get(); } + static double butterflyMovementSpeed() { return BUTTERFLY_MOVEMENT_SPEED.get(); } + static double butterflyFlyingSpeed() { return BUTTERFLY_FLYING_SPEED.get(); } static double toreterrorHealth() { return TORETERROR_HEALTH.get(); } static double toreterrorDamageRange() { return TORETERROR_DAMAGE_RANGE.get(); } diff --git a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyToolsConfig.java b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyToolsConfig.java index 4627b4e4..01126de9 100644 --- a/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyToolsConfig.java +++ b/forge-1.20.1/src/main/java/com/craisinlord/antarchy/forge/AntarchyToolsConfig.java @@ -46,13 +46,6 @@ public final class AntarchyToolsConfig { private static final ForgeConfigSpec.IntValue ULTIMATE_CROSSBOW_ENCHANTABILITY; - // Ultimate Mace - - private static final ForgeConfigSpec.DoubleValue ULTIMATE_MACE_DAMAGE_MULTIPLIER; - private static final ForgeConfigSpec.DoubleValue ULTIMATE_MACE_ATTACK_SPEED; - private static final ForgeConfigSpec.IntValue ULTIMATE_MACE_ENCHANTABILITY; - - // Ultimate Armor private static final ForgeConfigSpec.BooleanValue ULTIMATE_ARMOR_COMES_ENCHANTED; @@ -99,15 +92,12 @@ public final class AntarchyToolsConfig { private static final ForgeConfigSpec.DoubleValue BIG_BERTHA_NONE_MODE_DAMAGE_BONUS_PERCENT; private static final ForgeConfigSpec.DoubleValue BIG_BERTHA_NIGHTMARE_DAMAGE_BONUS_PERCENT; private static final ForgeConfigSpec.DoubleValue SCORPION_WHIP_BASE_DAMAGE; - private static final ForgeConfigSpec.DoubleValue SCORPION_WHIP_REACH_BONUS; private static final ForgeConfigSpec.IntValue SCORPION_WHIP_POISON_DURATION_TICKS; private static final ForgeConfigSpec.DoubleValue SCORPION_WHIP_TETHER_MAX_RANGE; private static final ForgeConfigSpec.DoubleValue SCORPION_WHIP_SNAP_BONUS_DAMAGE; private static final ForgeConfigSpec.DoubleValue SCORPION_WHIP_PULL_STRENGTH; private static final ForgeConfigSpec.DoubleValue SCORPION_WHIP_HEAVY_PULL_MULTIPLIER; private static final ForgeConfigSpec.DoubleValue SCORPION_WHIP_SELF_PULL_MULTIPLIER; - private static final ForgeConfigSpec.IntValue SCORPION_WHIP_REEL_COOLDOWN_TICKS; - private static final ForgeConfigSpec.IntValue SCORPION_WHIP_SNAP_COOLDOWN_TICKS; private static final ForgeConfigSpec.IntValue BLOOD_CRYSTAL_KATANA_ATTACK_DAMAGE; private static final ForgeConfigSpec.DoubleValue BLOOD_CRYSTAL_KATANA_LAUNCH_STRENGTH; private static final ForgeConfigSpec.IntValue BLOOD_CRYSTAL_KATANA_TRAIL_DURATION_TICKS; @@ -124,8 +114,11 @@ public final class AntarchyToolsConfig { private static final ForgeConfigSpec.DoubleValue NIGHTMARE_LEGGINGS_ARMOR_TOUGHNESS; private static final ForgeConfigSpec.DoubleValue NIGHTMARE_BOOTS_ARMOR_TOUGHNESS; private static final ForgeConfigSpec.DoubleValue NIGHTMARE_ARMOR_KNOCKBACK_RESISTANCE; + private static final ForgeConfigSpec.DoubleValue NIGHTMARE_HELMET_DOUBLE_DAMAGE_CHANCE; + private static final ForgeConfigSpec.DoubleValue NIGHTMARE_CHESTPLATE_DOUBLE_DAMAGE_CHANCE; + private static final ForgeConfigSpec.DoubleValue NIGHTMARE_LEGGINGS_DOUBLE_DAMAGE_CHANCE; + private static final ForgeConfigSpec.DoubleValue NIGHTMARE_BOOTS_DOUBLE_DAMAGE_CHANCE; private static final ForgeConfigSpec.DoubleValue PRIMORDIAL_ARMOR_KNOCKBACK_PER_PIECE; - private static final ForgeConfigSpec.DoubleValue NIGHTMARE_ARMOR_DREAD_AURA_RANGE_PER_PIECE; private static final ForgeConfigSpec.DoubleValue NIGHTMARE_SWORD_BASE_DAMAGE; private static final ForgeConfigSpec.DoubleValue NIGHTMARE_SWORD_ATTACK_SPEED; private static final ForgeConfigSpec.DoubleValue NIGHTMARE_SWORD_SCALING_FACTOR; @@ -215,8 +208,6 @@ public final class AntarchyToolsConfig { // Moggles private static final ForgeConfigSpec.DoubleValue MOGGLES_VISION_RADIUS; - private static final ForgeConfigSpec.IntValue MOGGLES_VISION_MAX_LIGHT; - private static final ForgeConfigSpec.DoubleValue MOGGLES_VISION_ALPHA; static { @@ -278,15 +269,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); - ULTIMATE_MACE_ENCHANTABILITY = b.comment("Enchantability of the Ultimate Mace.") .defineInRange("enchantability", 20, 0, 100); - b.pop(); - - // Ultimate Armor b.push("ultimateArmor"); @@ -347,15 +329,12 @@ public final class AntarchyToolsConfig { b.push("scorpionWhip"); SCORPION_WHIP_BASE_DAMAGE = b.comment("Base lash damage of the Scorpion Stinger Whip.").defineInRange("baseDamage", 10.0D, 0.0D, 4096.0D); - SCORPION_WHIP_REACH_BONUS = b.comment("Extra entity interaction range in blocks while held in main hand.").defineInRange("reachBonus", 5.0D, 0.0D, 32.0D); SCORPION_WHIP_POISON_DURATION_TICKS = b.comment("Poison duration applied on lash.").defineInRange("poisonDurationTicks", 100, 0, 20000); SCORPION_WHIP_TETHER_MAX_RANGE = b.comment("Maximum tether distance before it breaks.").defineInRange("tetherMaxRange", 10.0D, 0.0D, 128.0D); SCORPION_WHIP_SNAP_BONUS_DAMAGE = b.comment("Bonus damage dealt when snapping the tether free.").defineInRange("snapBonusDamage", 6.0D, 0.0D, 4096.0D); SCORPION_WHIP_PULL_STRENGTH = b.comment("Pull strength applied to normal tethered targets.").defineInRange("pullStrength", 0.75D, 0.0D, 8.0D); SCORPION_WHIP_HEAVY_PULL_MULTIPLIER = b.comment("Reduced pull strength applied to heavy targets.").defineInRange("heavyPullMultiplier", 0.25D, 0.0D, 8.0D); SCORPION_WHIP_SELF_PULL_MULTIPLIER = b.comment("Self-pull strength toward heavy tethered targets.").defineInRange("selfPullMultiplier", 0.45D, 0.0D, 8.0D); - SCORPION_WHIP_REEL_COOLDOWN_TICKS = b.comment("Cooldown after reeling with the whip, in ticks.").defineInRange("reelCooldownTicks", 10, 0, 72000); - SCORPION_WHIP_SNAP_COOLDOWN_TICKS = b.comment("Cooldown after snapping the whip, in ticks.").defineInRange("snapCooldownTicks", 30, 0, 72000); b.pop(); b.push("bloodCrystalKatana"); @@ -377,8 +356,11 @@ public final class AntarchyToolsConfig { NIGHTMARE_LEGGINGS_ARMOR_TOUGHNESS = b.comment("Armor toughness of the Nightmare Leggings.") .defineInRange("leggingsToughness", 3.0D, 0.0D, 100.0D); NIGHTMARE_BOOTS_ARMOR_TOUGHNESS = b.comment("Armor toughness of the Nightmare Boots.") .defineInRange("bootsToughness", 3.0D, 0.0D, 100.0D); NIGHTMARE_ARMOR_KNOCKBACK_RESISTANCE = b.comment("Knockback resistance granted by each Nightmare Armor piece.") .defineInRange("knockbackResistance", 0.1D, 0.0D, 1.0D); + NIGHTMARE_HELMET_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Helmet to double incoming damage dealt back to attackers.").defineInRange("helmetDoubleDamageChance", 0.04D, 0.0D, 1.0D); + NIGHTMARE_CHESTPLATE_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Chestplate to double incoming damage dealt back to attackers.").defineInRange("chestplateDoubleDamageChance", 0.06D, 0.0D, 1.0D); + NIGHTMARE_LEGGINGS_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Leggings to double incoming damage dealt back to attackers.").defineInRange("leggingsDoubleDamageChance", 0.05D, 0.0D, 1.0D); + NIGHTMARE_BOOTS_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Boots to double incoming damage dealt back to attackers.").defineInRange("bootsDoubleDamageChance", 0.03D, 0.0D, 1.0D); PRIMORDIAL_ARMOR_KNOCKBACK_PER_PIECE = b.comment("Attack knockback added by each Primordial Armor piece.") .defineInRange("primordialArmorKnockbackPerPiece", 0.5D, 0.0D, 16.0D); - NIGHTMARE_ARMOR_DREAD_AURA_RANGE_PER_PIECE = b.comment("Additional Dread aura range added by each Nightmare armor piece.").defineInRange("dreadAuraRangePerPiece", 2.0D, 0.0D, 64.0D); b.pop(); b.push("nightmareSword"); @@ -531,8 +513,6 @@ public final class AntarchyToolsConfig { b.push("moggles"); MOGGLES_VISION_RADIUS = b.comment("Radius used by Moggles cave detection.").defineInRange("visionRadius", 20.0D, 1.0D, 128.0D); - MOGGLES_VISION_MAX_LIGHT = b.comment("Maximum block light level counted as dark enough for Moggles.").defineInRange("visionMaxLight", 7, 0, 15); - MOGGLES_VISION_ALPHA = b.comment("Overlay alpha used by Moggles vision rendering.").defineInRange("visionAlpha", 0.65D, 0.0D, 1.0D); b.pop(); SPEC = b.build(); @@ -568,10 +548,6 @@ public final class AntarchyToolsConfig { static double ultimateCrossbowChargeSpeedMultiplier() { return ULTIMATE_CROSSBOW_CHARGE_SPEED_MULTIPLIER.get(); } static int ultimateCrossbowEnchantability() { return ULTIMATE_CROSSBOW_ENCHANTABILITY.get(); } - static double ultimateMaceDamageMultiplier() { return ULTIMATE_MACE_DAMAGE_MULTIPLIER.get(); } - static double ultimateMaceAttackSpeed() { return ULTIMATE_MACE_ATTACK_SPEED.get(); } - static int ultimateMaceEnchantability() { return ULTIMATE_MACE_ENCHANTABILITY.get(); } - static boolean ultimateArmorComesEnchanted() { return ULTIMATE_ARMOR_COMES_ENCHANTED.get(); } static int ultimateArmorEnchantability() { return ULTIMATE_ARMOR_ENCHANTABILITY.get(); } static int ultimateHelmetArmorValue() { return ULTIMATE_HELMET_ARMOR_VALUE.get(); } @@ -611,15 +587,12 @@ public final class AntarchyToolsConfig { static int krakensGraspTentacleSlownessAmplifier() { return KRAKENS_GRASP_TENTACLE_SLOWNESS_AMPLIFIER.get(); } static int krakensGraspTentacleSlownessRefreshTicks() { return KRAKENS_GRASP_TENTACLE_SLOWNESS_REFRESH_TICKS.get(); } static double scorpionWhipBaseDamage() { return SCORPION_WHIP_BASE_DAMAGE.get(); } - static double scorpionWhipReachBonus() { return SCORPION_WHIP_REACH_BONUS.get(); } static int scorpionWhipPoisonDurationTicks() { return SCORPION_WHIP_POISON_DURATION_TICKS.get(); } static double scorpionWhipTetherMaxRange() { return SCORPION_WHIP_TETHER_MAX_RANGE.get(); } static double scorpionWhipSnapBonusDamage() { return SCORPION_WHIP_SNAP_BONUS_DAMAGE.get(); } static double scorpionWhipPullStrength() { return SCORPION_WHIP_PULL_STRENGTH.get(); } static double scorpionWhipHeavyPullMultiplier() { return SCORPION_WHIP_HEAVY_PULL_MULTIPLIER.get(); } static double scorpionWhipSelfPullMultiplier() { return SCORPION_WHIP_SELF_PULL_MULTIPLIER.get(); } - static int scorpionWhipReelCooldownTicks() { return SCORPION_WHIP_REEL_COOLDOWN_TICKS.get(); } - static int scorpionWhipSnapCooldownTicks() { return SCORPION_WHIP_SNAP_COOLDOWN_TICKS.get(); } static int bloodCrystalKatanaAttackDamage() { return BLOOD_CRYSTAL_KATANA_ATTACK_DAMAGE.get(); } static double bloodCrystalKatanaLaunchStrength() { return BLOOD_CRYSTAL_KATANA_LAUNCH_STRENGTH.get(); } static int bloodCrystalKatanaTrailDurationTicks() { return BLOOD_CRYSTAL_KATANA_TRAIL_DURATION_TICKS.get(); } @@ -633,8 +606,11 @@ public final class AntarchyToolsConfig { static double nightmareLeggingsArmorToughness() { return NIGHTMARE_LEGGINGS_ARMOR_TOUGHNESS.get(); } static double nightmareBootsArmorToughness() { return NIGHTMARE_BOOTS_ARMOR_TOUGHNESS.get(); } static double nightmareArmorKnockbackResistance() { return NIGHTMARE_ARMOR_KNOCKBACK_RESISTANCE.get(); } + static double nightmareHelmetDoubleDamageChance() { return NIGHTMARE_HELMET_DOUBLE_DAMAGE_CHANCE.get(); } + static double nightmareChestplateDoubleDamageChance() { return NIGHTMARE_CHESTPLATE_DOUBLE_DAMAGE_CHANCE.get(); } + static double nightmareLeggingsDoubleDamageChance() { return NIGHTMARE_LEGGINGS_DOUBLE_DAMAGE_CHANCE.get(); } + static double nightmareBootsDoubleDamageChance() { return NIGHTMARE_BOOTS_DOUBLE_DAMAGE_CHANCE.get(); } static double primordialArmorKnockbackPerPiece() { return PRIMORDIAL_ARMOR_KNOCKBACK_PER_PIECE.get(); } - static double nightmareArmorDreadAuraRangePerPiece() { return NIGHTMARE_ARMOR_DREAD_AURA_RANGE_PER_PIECE.get(); } static double nightmareSwordBaseDamage() { return NIGHTMARE_SWORD_BASE_DAMAGE.get(); } static double nightmareSwordAttackSpeed() { return NIGHTMARE_SWORD_ATTACK_SPEED.get(); } static double nightmareSwordScalingFactor() { return NIGHTMARE_SWORD_SCALING_FACTOR.get(); } @@ -701,8 +677,6 @@ public final class AntarchyToolsConfig { static int americanRegenerationDurationTicks() { return AMERICAN_REGENERATION_DURATION_TICKS.get(); } static int americanRegenerationAmplifier() { return AMERICAN_REGENERATION_AMPLIFIER.get(); } static double mogglesVisionRadius() { return MOGGLES_VISION_RADIUS.get(); } - static int mogglesVisionMaxLight() { return MOGGLES_VISION_MAX_LIGHT.get(); } - static double mogglesVisionAlpha() { return MOGGLES_VISION_ALPHA.get(); } } diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java index 067be629..2d34543e 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyConfigModuleNeoforge.java @@ -98,25 +98,53 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setJumpyBugHealth(AntarchyMobsConfig.jumpyBugHealth()); AntarchySettings.setJumpyBugPounceDamage(AntarchyMobsConfig.jumpyBugPounceDamage()); - AntarchySettings.setJumpyBugLatchDamage(AntarchyMobsConfig.jumpyBugLatchDamage()); AntarchySettings.setJumpyBugCamouflageAlpha(AntarchyMobsConfig.jumpyBugCamouflageAlpha()); + AntarchySettings.setEmperorScorpionHealth(AntarchyMobsConfig.emperorScorpionHealth()); + AntarchySettings.setEmperorScorpionAttackDamage(AntarchyMobsConfig.emperorScorpionAttackDamage()); + AntarchySettings.setEmperorScorpionMovementSpeed(AntarchyMobsConfig.emperorScorpionMovementSpeed()); + AntarchySettings.setEmperorScorpionArmor(AntarchyMobsConfig.emperorScorpionArmor()); + AntarchySettings.setEmperorScorpionKnockbackResistance(AntarchyMobsConfig.emperorScorpionKnockbackResistance()); + AntarchySettings.setEmperorScorpionFollowRange(AntarchyMobsConfig.emperorScorpionFollowRange()); + AntarchySettings.setEmperorScorpionXpReward(AntarchyMobsConfig.emperorScorpionXpReward()); + AntarchySettings.setEmperorScorpionClawAnimTicks(AntarchyMobsConfig.emperorScorpionClawAnimTicks()); + AntarchySettings.setEmperorScorpionClawHitTick(AntarchyMobsConfig.emperorScorpionClawHitTick()); + AntarchySettings.setEmperorScorpionClawCooldownTicks(AntarchyMobsConfig.emperorScorpionClawCooldownTicks()); + AntarchySettings.setEmperorScorpionStingAnimTicks(AntarchyMobsConfig.emperorScorpionStingAnimTicks()); + AntarchySettings.setEmperorScorpionStingHitTick(AntarchyMobsConfig.emperorScorpionStingHitTick()); + AntarchySettings.setEmperorScorpionStingCooldownTicks(AntarchyMobsConfig.emperorScorpionStingCooldownTicks()); + AntarchySettings.setEmperorScorpionPoisonTicks(AntarchyMobsConfig.emperorScorpionPoisonTicks()); + AntarchySettings.setEmperorScorpionWeaknessTicks(AntarchyMobsConfig.emperorScorpionWeaknessTicks()); + AntarchySettings.setEmperorScorpionSummonIntervalTicks(AntarchyMobsConfig.emperorScorpionSummonIntervalTicks()); + AntarchySettings.setEmperorScorpionMaxSummonedScorpions(AntarchyMobsConfig.emperorScorpionMaxSummonedScorpions()); + AntarchySettings.setEmperorScorpionMaxNearbyScorpions(AntarchyMobsConfig.emperorScorpionMaxNearbyScorpions()); + AntarchySettings.setEmperorScorpionHardenCooldownTicks(AntarchyMobsConfig.emperorScorpionHardenCooldownTicks()); AntarchySettings.setEmperorScorpionDamageRange(AntarchyMobsConfig.emperorScorpionDamageRange()); AntarchySettings.setEmperorScorpionMinDespawnTicks(AntarchyMobsConfig.emperorScorpionMinDespawnTicks()); AntarchySettings.setKrakenHealth(AntarchyMobsConfig.krakenHealth()); AntarchySettings.setKrakenAttackDamage(AntarchyMobsConfig.krakenAttackDamage()); - AntarchySettings.setKrakenProjectileDamageTakenMultiplier(AntarchyMobsConfig.krakenProjectileDamageTakenMultiplier()); AntarchySettings.setKrakenSquidSpawnEnabled(AntarchyMobsConfig.krakenSquidSpawnEnabled()); AntarchySettings.setKrakenMassSpawnEnabled(AntarchyMobsConfig.krakenMassSpawnEnabled()); AntarchySettings.setKrakenRequireBadOmenToSummon(AntarchyMobsConfig.krakenRequireBadOmenToSummon()); AntarchySettings.setKrakenFollowRange(AntarchyMobsConfig.krakenFollowRange()); AntarchySettings.setKrakenDamageRange(AntarchyMobsConfig.krakenDamageRange()); + AntarchySettings.setKrakenArmor(AntarchyMobsConfig.krakenArmor()); + AntarchySettings.setKrakenKnockbackResistance(AntarchyMobsConfig.krakenKnockbackResistance()); + AntarchySettings.setKrakenMovementSpeed(AntarchyMobsConfig.krakenMovementSpeed()); + AntarchySettings.setKrakenFlyingSpeed(AntarchyMobsConfig.krakenFlyingSpeed()); + AntarchySettings.setKrakenBossBarRange(AntarchyMobsConfig.krakenBossBarRange()); + AntarchySettings.setKrakenLightningDamagePhaseOne(AntarchyMobsConfig.krakenLightningDamagePhaseOne()); AntarchySettings.setBrutalflyHealth(AntarchyMobsConfig.brutalflyHealth()); AntarchySettings.setBrutalflySwipeDamage(AntarchyMobsConfig.brutalflySwipeDamage()); AntarchySettings.setBrutalflySpitDamage(AntarchyMobsConfig.brutalflySpitDamage()); AntarchySettings.setBrutalflyDamageRange(AntarchyMobsConfig.brutalflyDamageRange()); + AntarchySettings.setBrutalflyArmor(AntarchyMobsConfig.brutalflyArmor()); + AntarchySettings.setBrutalflyArmorToughness(AntarchyMobsConfig.brutalflyArmorToughness()); + AntarchySettings.setBrutalflyKnockbackResistance(AntarchyMobsConfig.brutalflyKnockbackResistance()); + AntarchySettings.setBrutalflyMovementSpeed(AntarchyMobsConfig.brutalflyMovementSpeed()); + AntarchySettings.setBrutalflyFlyingSpeed(AntarchyMobsConfig.brutalflyFlyingSpeed()); AntarchySettings.setMantisHealth(AntarchyMobsConfig.mantisHealth()); AntarchySettings.setMantisAttackDamage(AntarchyMobsConfig.mantisAttackDamage()); @@ -135,7 +163,6 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setRollyPollyHealth(AntarchyMobsConfig.rollyPollyHealth()); AntarchySettings.setRollyPollyMovementSpeed(AntarchyMobsConfig.rollyPollyMovementSpeed()); AntarchySettings.setRollyPollyRollSpeedMultiplier(AntarchyMobsConfig.rollyPollyRollSpeedMultiplier()); - AntarchySettings.setRollyPollyTumbleDamage(AntarchyMobsConfig.rollyPollyTumbleDamage()); AntarchySettings.setRollyPollyTameChance(AntarchyMobsConfig.rollyPollyTameChance()); AntarchySettings.setRollyPollyBowlingDamage(AntarchyMobsConfig.rollyPollyBowlingDamage()); AntarchySettings.setRollyPollyBowlingKnockback(AntarchyMobsConfig.rollyPollyBowlingKnockback()); @@ -164,6 +191,14 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setNightmareHealth(AntarchyMobsConfig.nightmareHealth()); AntarchySettings.setNightmareAttackDamage(AntarchyMobsConfig.nightmareAttackDamage()); + AntarchySettings.setNightmareMovementSpeed(AntarchyMobsConfig.nightmareMovementSpeed()); + AntarchySettings.setNightmareWeaknessTicks(AntarchyMobsConfig.nightmareWeaknessTicks()); + AntarchySettings.setNightmareDreadTicks(AntarchyMobsConfig.nightmareDreadTicks()); + AntarchySettings.setDimensionalTearLifetimeTicks(AntarchyMobsConfig.dimensionalTearLifetimeTicks()); + AntarchySettings.setDimensionalTearInvertedDurationTicks(AntarchyMobsConfig.dimensionalTearInvertedDurationTicks()); + AntarchySettings.setDimensionalTearEmergenceMinIntervalTicks(AntarchyMobsConfig.dimensionalTearEmergenceMinIntervalTicks()); + AntarchySettings.setDimensionalTearEmergenceMaxIntervalTicks(AntarchyMobsConfig.dimensionalTearEmergenceMaxIntervalTicks()); + AntarchySettings.setDimensionalTearLucidEventChance(AntarchyMobsConfig.dimensionalTearLucidEventChance()); AntarchySettings.setBasiliskPetrifyingGazeEnabled(AntarchyMobsConfig.basiliskPetrifyingGazeEnabled()); AntarchySettings.setBasiliskSpawnMaxLightLevel(AntarchyMobsConfig.basiliskSpawnMaxLightLevel()); @@ -189,6 +224,11 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setLucidAttackRange(AntarchyMobsConfig.lucidAttackRange()); AntarchySettings.setLucidPearlInvertedDurationSeconds(AntarchyMobsConfig.lucidPearlInvertedDurationSeconds()); + AntarchySettings.setLucidHealth(AntarchyMobsConfig.lucidHealth()); + AntarchySettings.setLucidAttackDamage(AntarchyMobsConfig.lucidAttackDamage()); + AntarchySettings.setLucidMovementSpeed(AntarchyMobsConfig.lucidMovementSpeed()); + AntarchySettings.setLucidFlyingSpeed(AntarchyMobsConfig.lucidFlyingSpeed()); + AntarchySettings.setLucidKnockbackResistance(AntarchyMobsConfig.lucidKnockbackResistance()); AntarchySettings.setDreadHallucinationSoundsEnabled(AntarchyMobsConfig.dreadHallucinationSoundsEnabled()); AntarchySettings.setDreadHallucinationSoundMinInterval(AntarchyMobsConfig.dreadHallucinationSoundMinInterval()); @@ -203,13 +243,11 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setToreterrorJumpAttackKnockback(AntarchyMobsConfig.toreterrorJumpAttackKnockback()); AntarchySettings.setToreterrorSpinDamage(AntarchyMobsConfig.toreterrorSpinDamage()); AntarchySettings.setToreterrorSpinKnockback(AntarchyMobsConfig.toreterrorSpinKnockback()); - AntarchySettings.setToreterrorRangedWaterBombChance(AntarchyMobsConfig.toreterrorRangedWaterBombChance()); AntarchySettings.setToreterrorProjectileDamageMultiplier(AntarchyMobsConfig.toreterrorProjectileDamageMultiplier()); AntarchySettings.setWaterBombDamage(AntarchyMobsConfig.waterBombDamage()); AntarchySettings.setWaterBombLifetimeTicks(AntarchyMobsConfig.waterBombLifetimeTicks()); AntarchySettings.setWaterBombGravity(AntarchyMobsConfig.waterBombGravity()); AntarchySettings.setWaterBombKnockback(AntarchyMobsConfig.waterBombKnockback()); - AntarchySettings.setWaterCannonCooldownSeconds(AntarchyMobsConfig.waterCannonCooldownSeconds()); AntarchySettings.setCreepingHorrorHealth(AntarchyMobsConfig.creepingHorrorHealth()); AntarchySettings.setCreepingHorrorAttackDamage(AntarchyMobsConfig.creepingHorrorAttackDamage()); @@ -232,6 +270,7 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setHerculesBeetleDamageRange(AntarchyMobsConfig.herculesBeetleDamageRange()); AntarchySettings.setOuranwoodDeerHealth(AntarchyMobsConfig.ouranwoodDeerHealth()); AntarchySettings.setGlimmerHealth(AntarchyMobsConfig.glimmerHealth()); + AntarchySettings.setAntDanceRadius(AntarchyMobsConfig.antDanceRadius()); } private static void bakeToolsConfig() { @@ -308,9 +347,7 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setScorpionWhipReachBonus(AntarchyToolsConfig.scorpionWhipReachBonus()); AntarchySettings.setScorpionWhipPoisonDurationTicks(AntarchyToolsConfig.scorpionWhipPoisonDurationTicks()); AntarchySettings.setScorpionWhipTetherMaxRange(AntarchyToolsConfig.scorpionWhipTetherMaxRange()); - AntarchySettings.setScorpionWhipReelCooldownTicks(AntarchyToolsConfig.scorpionWhipReelCooldownTicks()); AntarchySettings.setScorpionWhipSnapBonusDamage(AntarchyToolsConfig.scorpionWhipSnapBonusDamage()); - AntarchySettings.setScorpionWhipSnapCooldownTicks(AntarchyToolsConfig.scorpionWhipSnapCooldownTicks()); AntarchySettings.setScorpionWhipPullStrength(AntarchyToolsConfig.scorpionWhipPullStrength()); AntarchySettings.setScorpionWhipHeavyPullMultiplier(AntarchyToolsConfig.scorpionWhipHeavyPullMultiplier()); AntarchySettings.setScorpionWhipSelfPullMultiplier(AntarchyToolsConfig.scorpionWhipSelfPullMultiplier()); @@ -327,7 +364,10 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setNightmareLeggingsArmorToughness(AntarchyToolsConfig.nightmareLeggingsArmorToughness()); AntarchySettings.setNightmareBootsArmorToughness(AntarchyToolsConfig.nightmareBootsArmorToughness()); AntarchySettings.setNightmareArmorKnockbackResistance(AntarchyToolsConfig.nightmareArmorKnockbackResistance()); - AntarchySettings.setNightmareArmorDreadAuraRangePerPiece(AntarchyToolsConfig.nightmareArmorDreadAuraRangePerPiece()); + AntarchySettings.setNightmareHelmetDoubleDamageChance(AntarchyToolsConfig.nightmareHelmetDoubleDamageChance()); + AntarchySettings.setNightmareChestplateDoubleDamageChance(AntarchyToolsConfig.nightmareChestplateDoubleDamageChance()); + AntarchySettings.setNightmareLeggingsDoubleDamageChance(AntarchyToolsConfig.nightmareLeggingsDoubleDamageChance()); + AntarchySettings.setNightmareBootsDoubleDamageChance(AntarchyToolsConfig.nightmareBootsDoubleDamageChance()); AntarchySettings.setPrimordialArmorKnockbackPerPiece(AntarchyToolsConfig.primordialArmorKnockbackPerPiece()); AntarchySettings.setNightmareSwordBaseDamage(AntarchyToolsConfig.nightmareSwordBaseDamage()); AntarchySettings.setNightmareSwordAttackSpeed(AntarchyToolsConfig.nightmareSwordAttackSpeed()); @@ -377,11 +417,8 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setAmericanBonusSaturation(AntarchyToolsConfig.americanBonusSaturation()); AntarchySettings.setAmericanRegenerationDurationTicks(AntarchyToolsConfig.americanRegenerationDurationTicks()); AntarchySettings.setAmericanRegenerationAmplifier(AntarchyToolsConfig.americanRegenerationAmplifier()); - AntarchySettings.setAntDanceRadius(AntarchyMobsConfig.antDanceRadius()); AntarchySettings.setMogglesVisionRadius(AntarchyToolsConfig.mogglesVisionRadius()); - AntarchySettings.setMogglesVisionMaxLight(AntarchyToolsConfig.mogglesVisionMaxLight()); - AntarchySettings.setMogglesVisionAlpha(AntarchyToolsConfig.mogglesVisionAlpha()); } private static void bakeMiscConfig() { @@ -412,13 +449,12 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setDreamSandEnabled(AntarchyMiscConfig.dreamSandEnabled()); AntarchySettings.setDreamSandJumpVelocityMultiplier(AntarchyMiscConfig.dreamSandJumpVelocityMultiplier()); AntarchySettings.setDreamSandGravityMultiplier(AntarchyMiscConfig.dreamSandGravityMultiplier()); - AntarchySettings.setDreamSandFallDamageMultiplier(AntarchyMiscConfig.dreamSandFallDamageMultiplier()); + AntarchySettings.setDreamSandFallingBlockGravityMultiplier(AntarchyMiscConfig.dreamSandFallingBlockGravityMultiplier()); AntarchySettings.setDreamSandEffectDurationSeconds(AntarchyMiscConfig.dreamSandEffectDurationSeconds()); AntarchySettings.setIchorWitherEnabled(AntarchyMiscConfig.ichorWitherEnabled()); AntarchySettings.setDuplicatorTreeEnabled(AntarchyMiscConfig.duplicatorTreeEnabled()); - AntarchySettings.setGlowingTorchflowers(AntarchyMiscConfig.glowingTorchflowers()); AntarchySettings.setGlowVinesUnderLeaves(AntarchyMiscConfig.glowVinesUnderLeaves()); AntarchySettings.setSwingThroughGrassEnabled(AntarchyMiscConfig.swingThroughGrassEnabled()); AntarchySettings.setFabricKeybindingConflictFixEnabled(AntarchyMiscConfig.fabricKeybindingConflictFixEnabled()); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMiscConfig.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMiscConfig.java index a443b4b7..3f6dc61c 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMiscConfig.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMiscConfig.java @@ -13,7 +13,7 @@ public final class AntarchyMiscConfig { private static final ModConfigSpec.DoubleValue DREAM_SAND_JUMP_VELOCITY_MULTIPLIER; private static final ModConfigSpec.DoubleValue DREAM_SAND_GRAVITY_MULTIPLIER; private static final ModConfigSpec.DoubleValue DREAM_SAND_EFFECT_DURATION_SECONDS; - private static final ModConfigSpec.DoubleValue DREAM_SAND_FALL_DAMAGE_MULTIPLIER; + private static final ModConfigSpec.DoubleValue DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER; // Ichor private static final ModConfigSpec.BooleanValue ICHOR_WITHER_ENABLED; @@ -47,7 +47,6 @@ public final class AntarchyMiscConfig { // 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 GLOWING_TORCHFLOWERS; private static final ModConfigSpec.BooleanValue SWING_THROUGH_GRASS_ENABLED; private static final ModConfigSpec.BooleanValue FABRIC_KEYBINDING_CONFLICT_FIX_ENABLED; private static final ModConfigSpec.BooleanValue EXPERIMENTAL_SETTINGS_POPUP_DISABLED; @@ -73,7 +72,7 @@ public final class AntarchyMiscConfig { DREAM_SAND_JUMP_VELOCITY_MULTIPLIER = b.comment("Multiplier applied to upward jump velocity when leaving dream sand.") .defineInRange("jumpVelocityMultiplier", 1.3D, 0.0D, 16.0D); DREAM_SAND_GRAVITY_MULTIPLIER = b.comment("Multiplier applied to downward velocity while low gravity is active.") .defineInRange("gravityMultiplier", 0.45D, 0.0D, 1.0D); DREAM_SAND_EFFECT_DURATION_SECONDS = b.comment("Seconds the low-gravity effect remains active after leaving dream sand.") .defineInRange("effectDurationSeconds", 7.0D, 0.0D, 60.0D); - DREAM_SAND_FALL_DAMAGE_MULTIPLIER = b.comment("Multiplier applied to fall damage after dream sand low gravity.").defineInRange("fallDamageMultiplier", 0.4D, 0.0D, 16.0D); + DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER = b.comment("Multiplier applied to dream sand's own falling-block gravity (how slowly it falls as a block, distinct from the player low-gravity effect).").defineInRange("fallingBlockGravityMultiplier", 0.4D, 0.0D, 16.0D); b.pop(); @@ -147,7 +146,6 @@ public final class AntarchyMiscConfig { 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); - GLOWING_TORCHFLOWERS = b.comment("If true, torchflowers use the glowing behavior.").define("glowingTorchflowers", true); SWING_THROUGH_GRASS_ENABLED = b.comment("If true, empty collision plants like grass do not block melee target picking.") .define("swingThroughGrassEnabled", true); FABRIC_KEYBINDING_CONFLICT_FIX_ENABLED = b.define("fabricKeybindingConflictFixEnabled", true); EXPERIMENTAL_SETTINGS_POPUP_DISABLED = b.define("experimentalSettingsPopupDisabled", true); @@ -165,13 +163,12 @@ public final class AntarchyMiscConfig { static double dreamSandJumpVelocityMultiplier() { return DREAM_SAND_JUMP_VELOCITY_MULTIPLIER.get(); } static double dreamSandGravityMultiplier() { return DREAM_SAND_GRAVITY_MULTIPLIER.get(); } static double dreamSandEffectDurationSeconds() { return DREAM_SAND_EFFECT_DURATION_SECONDS.get(); } - static double dreamSandFallDamageMultiplier() { return DREAM_SAND_FALL_DAMAGE_MULTIPLIER.get(); } + static double dreamSandFallingBlockGravityMultiplier() { return DREAM_SAND_FALLING_BLOCK_GRAVITY_MULTIPLIER.get(); } static boolean ichorWitherEnabled() { return ICHOR_WITHER_ENABLED.get(); } static boolean duplicatorTreeEnabled() { return DUPLICATOR_TREE_ENABLED.get(); } static boolean glowVinesUnderLeaves() { return GLOW_VINES_UNDER_LEAVES.get(); } - static boolean glowingTorchflowers() { return GLOWING_TORCHFLOWERS.get(); } static boolean swingThroughGrassEnabled() { return SWING_THROUGH_GRASS_ENABLED.get(); } static boolean fabricKeybindingConflictFixEnabled() { return FABRIC_KEYBINDING_CONFLICT_FIX_ENABLED.get(); } static boolean experimentalSettingsPopupDisabled() { return EXPERIMENTAL_SETTINGS_POPUP_DISABLED.get(); } diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java index c2cfe8b4..9adfba79 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java @@ -65,12 +65,30 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue JUMPY_BUG_HEALTH; private static final ModConfigSpec.DoubleValue JUMPY_BUG_POUNCE_DAMAGE; - private static final ModConfigSpec.DoubleValue JUMPY_BUG_LATCH_DAMAGE; private static final ModConfigSpec.DoubleValue JUMPY_BUG_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; + private static final ModConfigSpec.DoubleValue EMPEROR_SCORPION_ARMOR; + private static final ModConfigSpec.DoubleValue EMPEROR_SCORPION_KNOCKBACK_RESISTANCE; + private static final ModConfigSpec.DoubleValue EMPEROR_SCORPION_FOLLOW_RANGE; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_XP_REWARD; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_CLAW_ANIM_TICKS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_CLAW_HIT_TICK; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_CLAW_COOLDOWN_TICKS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_STING_ANIM_TICKS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_STING_HIT_TICK; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_STING_COOLDOWN_TICKS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_POISON_TICKS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_WEAKNESS_TICKS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_SUMMON_INTERVAL_TICKS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_MAX_SUMMONED_SCORPIONS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_MAX_NEARBY_SCORPIONS; + private static final ModConfigSpec.IntValue EMPEROR_SCORPION_HARDEN_COOLDOWN_TICKS; private static final ModConfigSpec.DoubleValue EMPEROR_SCORPION_DAMAGE_RANGE; private static final ModConfigSpec.IntValue EMPEROR_SCORPION_MIN_DESPAWN_TICKS; @@ -79,12 +97,17 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue KRAKEN_HEALTH; private static final ModConfigSpec.DoubleValue KRAKEN_ATTACK_DAMAGE; - private static final ModConfigSpec.DoubleValue KRAKEN_PROJECTILE_DAMAGE_TAKEN_MULTIPLIER; private static final ModConfigSpec.BooleanValue KRAKEN_SQUID_SPAWN_ENABLED; private static final ModConfigSpec.BooleanValue KRAKEN_MASS_SPAWN_ENABLED; private static final ModConfigSpec.BooleanValue KRAKEN_REQUIRE_BAD_OMEN_TO_SUMMON; private static final ModConfigSpec.DoubleValue KRAKEN_FOLLOW_RANGE; private static final ModConfigSpec.DoubleValue KRAKEN_DAMAGE_RANGE; + private static final ModConfigSpec.DoubleValue KRAKEN_ARMOR; + private static final ModConfigSpec.DoubleValue KRAKEN_KNOCKBACK_RESISTANCE; + private static final ModConfigSpec.DoubleValue KRAKEN_MOVEMENT_SPEED; + private static final ModConfigSpec.DoubleValue KRAKEN_FLYING_SPEED; + private static final ModConfigSpec.DoubleValue KRAKEN_BOSS_BAR_RANGE; + private static final ModConfigSpec.DoubleValue KRAKEN_LIGHTNING_DAMAGE_PHASE_ONE; // Brutalfly @@ -93,6 +116,11 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue BRUTALFLY_SWIPE_DAMAGE; private static final ModConfigSpec.DoubleValue BRUTALFLY_SPIT_DAMAGE; private static final ModConfigSpec.DoubleValue BRUTALFLY_DAMAGE_RANGE; + private static final ModConfigSpec.DoubleValue BRUTALFLY_ARMOR; + private static final ModConfigSpec.DoubleValue BRUTALFLY_ARMOR_TOUGHNESS; + private static final ModConfigSpec.DoubleValue BRUTALFLY_KNOCKBACK_RESISTANCE; + private static final ModConfigSpec.DoubleValue BRUTALFLY_MOVEMENT_SPEED; + private static final ModConfigSpec.DoubleValue BRUTALFLY_FLYING_SPEED; // Mantis @@ -122,7 +150,6 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue ROLLY_POLLY_ROLL_SPEED_MULTIPLIER; private static final ModConfigSpec.IntValue ROLLY_POLLY_TAME_CHANCE; private static final ModConfigSpec.DoubleValue ROLLY_POLLY_BOWLING_DAMAGE; - private static final ModConfigSpec.DoubleValue ROLLY_POLLY_TUMBLE_DAMAGE; private static final ModConfigSpec.DoubleValue ROLLY_POLLY_BOWLING_KNOCKBACK; private static final ModConfigSpec.DoubleValue ROLLY_POLLY_ARMOR; private static final ModConfigSpec.DoubleValue ROLLY_POLLY_ROLLED_ARMOR_BONUS; @@ -166,6 +193,14 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue NIGHTMARE_HEALTH; private static final ModConfigSpec.DoubleValue NIGHTMARE_ATTACK_DAMAGE; + private static final ModConfigSpec.DoubleValue NIGHTMARE_MOVEMENT_SPEED; + private static final ModConfigSpec.IntValue NIGHTMARE_WEAKNESS_TICKS; + private static final ModConfigSpec.IntValue NIGHTMARE_DREAD_TICKS; + private static final ModConfigSpec.IntValue DIMENSIONAL_TEAR_LIFETIME_TICKS; + private static final ModConfigSpec.IntValue DIMENSIONAL_TEAR_INVERTED_DURATION_TICKS; + private static final ModConfigSpec.IntValue DIMENSIONAL_TEAR_EMERGENCE_MIN_INTERVAL_TICKS; + private static final ModConfigSpec.IntValue DIMENSIONAL_TEAR_EMERGENCE_MAX_INTERVAL_TICKS; + private static final ModConfigSpec.DoubleValue DIMENSIONAL_TEAR_LUCID_EVENT_CHANCE; // Basilisk @@ -202,8 +237,6 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue TORETERROR_SPIN_DAMAGE; private static final ModConfigSpec.DoubleValue TORETERROR_SPIN_KNOCKBACK; private static final ModConfigSpec.DoubleValue TORETERROR_PROJECTILE_DAMAGE_MULTIPLIER; - private static final ModConfigSpec.DoubleValue TORETERROR_RANGED_WATER_BOMB_CHANCE; - private static final ModConfigSpec.DoubleValue WATER_CANNON_COOLDOWN_SECONDS; private static final ModConfigSpec.DoubleValue WATER_BOMB_DAMAGE; private static final ModConfigSpec.IntValue WATER_BOMB_LIFETIME_TICKS; private static final ModConfigSpec.DoubleValue WATER_BOMB_GRAVITY; @@ -266,6 +299,11 @@ public final class AntarchyMobsConfig { 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; + private static final ModConfigSpec.DoubleValue LUCID_ATTACK_DAMAGE; + private static final ModConfigSpec.DoubleValue LUCID_MOVEMENT_SPEED; + private static final ModConfigSpec.DoubleValue LUCID_FLYING_SPEED; + private static final ModConfigSpec.DoubleValue LUCID_KNOCKBACK_RESISTANCE; // Dread effect @@ -406,7 +444,6 @@ public final class AntarchyMobsConfig { b.push("jumpyBug"); JUMPY_BUG_HEALTH = b.comment("Base max health.").defineInRange("health", 100.0D, 1.0D, 32768.0D); JUMPY_BUG_POUNCE_DAMAGE = b.comment("Damage dealt on a successful pounce latch.").defineInRange("pounceDamage", 2.0D, 0.0D, 1024.0D); - JUMPY_BUG_LATCH_DAMAGE = b.comment("Damage dealt while latched onto a target.").defineInRange("latchDamage", 2.0D, 0.0D, 1024.0D); JUMPY_BUG_CAMOUFLAGE_ALPHA = b.comment("Renderer alpha while camouflaged.").defineInRange("camouflageAlpha", 0.18D, 0.01D, 1.0D); b.pop(); @@ -414,6 +451,25 @@ public final class AntarchyMobsConfig { // 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); + EMPEROR_SCORPION_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.384D, 0.0D, 10.0D); + EMPEROR_SCORPION_ARMOR = b.comment("Base armor value.").defineInRange("armor", 22.0D, 0.0D, 1024.0D); + EMPEROR_SCORPION_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.8D, 0.0D, 1.0D); + EMPEROR_SCORPION_FOLLOW_RANGE = b.comment("Base follow range.").defineInRange("followRange", 80.0D, 1.0D, 256.0D); + EMPEROR_SCORPION_XP_REWARD = b.comment("Base experience reward.").defineInRange("xpReward", 25, 0, 100000); + EMPEROR_SCORPION_CLAW_ANIM_TICKS = b.comment("Ticks for the claw attack animation window.").defineInRange("clawAnimTicks", 23, 1, 400); + EMPEROR_SCORPION_CLAW_HIT_TICK = b.comment("Tick during the claw animation when damage is applied.").defineInRange("clawHitTick", 12, 0, 400); + EMPEROR_SCORPION_CLAW_COOLDOWN_TICKS = b.comment("Ticks between claw attacks.").defineInRange("clawCooldownTicks", 28, 0, 2000); + EMPEROR_SCORPION_STING_ANIM_TICKS = b.comment("Ticks for the sting attack animation window.").defineInRange("stingAnimTicks", 25, 1, 400); + EMPEROR_SCORPION_STING_HIT_TICK = b.comment("Tick during the sting animation when damage is applied.").defineInRange("stingHitTick", 13, 0, 400); + EMPEROR_SCORPION_STING_COOLDOWN_TICKS = b.comment("Ticks between sting attacks.").defineInRange("stingCooldownTicks", 60, 0, 2000); + EMPEROR_SCORPION_POISON_TICKS = b.comment("Ticks the Poison effect from a sting lasts.").defineInRange("poisonTicks", 300, 0, 20000); + EMPEROR_SCORPION_WEAKNESS_TICKS = b.comment("Ticks the Weakness effect from a sting lasts.").defineInRange("weaknessTicks", 120, 0, 20000); + EMPEROR_SCORPION_SUMMON_INTERVAL_TICKS = b.comment("Ticks between minion scorpion summons while hardened.").defineInRange("summonIntervalTicks", 140, 20, 72000); + EMPEROR_SCORPION_MAX_SUMMONED_SCORPIONS = b.comment("Maximum scorpions summoned per hardening cast.").defineInRange("maxSummonedScorpions", 4, 0, 32); + EMPEROR_SCORPION_MAX_NEARBY_SCORPIONS = b.comment("Maximum owned scorpion minions allowed near this scorpion at once.").defineInRange("maxNearbyScorpions", 4, 0, 32); + EMPEROR_SCORPION_HARDEN_COOLDOWN_TICKS = b.comment("Cooldown in ticks before the Emperor Scorpion can harden and summon again.").defineInRange("hardenCooldownTicks", 2400, 0, 200000); EMPEROR_SCORPION_DAMAGE_RANGE = b .comment("Range in blocks a player must be within for the Emperor Scorpion to be able to take damage. Prevents cheesing it from outside its aggro range.") .defineInRange("damageRange", 25.0D, 1.0D, 256.0D); @@ -428,12 +484,17 @@ public final class AntarchyMobsConfig { 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); - KRAKEN_PROJECTILE_DAMAGE_TAKEN_MULTIPLIER = b.comment("Multiplier applied to projectile damage taken by the Kraken.").defineInRange("projectileDamageTakenMultiplier", 0.5D, 0.0D, 16.0D); KRAKEN_SQUID_SPAWN_ENABLED = b.comment("If true, a player killing a Missile Squid has a 1/100 chance to spawn a single Kraken nearby.") .define("squidSpawnEnabled", true); KRAKEN_MASS_SPAWN_ENABLED = b.comment("If true, a player killing a Missile Squid has a 1/500 chance to spawn 10 Krakens. Independent from the single spawn.").define("massSpawnEnabled", true); KRAKEN_REQUIRE_BAD_OMEN_TO_SUMMON = b.comment("If true, the killer must have Bad Omen to summon a single Kraken; chance scales with Bad Omen level. Mass spawn is unaffected by level but still requires Bad Omen when this is on.").define("requireBadOmenToSummon", true); KRAKEN_FOLLOW_RANGE = b.comment("How far the Kraken can see/target players.").defineInRange("followRange", 96.0D, 1.0D, 256.0D); KRAKEN_DAMAGE_RANGE = b.comment("Range in blocks a player must be within for the Kraken to be able to take damage. Prevents cheesing it from outside its aggro range.").defineInRange("damageRange", 35.0D, 1.0D, 256.0D); + KRAKEN_ARMOR = b.comment("Base armor value.").defineInRange("armor", 8.0D, 0.0D, 1024.0D); + KRAKEN_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.8D, 0.0D, 1.0D); + KRAKEN_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.24D, 0.0D, 10.0D); + KRAKEN_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.24D, 0.0D, 10.0D); + KRAKEN_BOSS_BAR_RANGE = b.comment("Range in blocks within which the Kraken's boss bar is shown to players.").defineInRange("bossBarRange", 40.0D, 1.0D, 256.0D); + KRAKEN_LIGHTNING_DAMAGE_PHASE_ONE = b.comment("Lightning strike damage during phase one.").defineInRange("lightningDamagePhaseOne", 6.0D, 0.0D, 1024.0D); b.pop(); @@ -444,6 +505,11 @@ public final class AntarchyMobsConfig { BRUTALFLY_SWIPE_DAMAGE = b.comment("Damage dealt by a claw swipe.") .defineInRange("swipeDamage", 15.0D, 0.0D, 1024.0D); BRUTALFLY_SPIT_DAMAGE = b.comment("Direct hit damage from a spit orb before lingering effect.").defineInRange("spitDamage", 5.0D, 0.0D, 1024.0D); BRUTALFLY_DAMAGE_RANGE = b.comment("Range in blocks a player must be within for the Brutalfly to be able to take damage. Prevents cheesing it from outside its aggro range.").defineInRange("damageRange", 25.0D, 1.0D, 256.0D); + BRUTALFLY_ARMOR = b.comment("Base armor value.").defineInRange("armor", 10.0D, 0.0D, 1024.0D); + BRUTALFLY_ARMOR_TOUGHNESS = b.comment("Base armor toughness.").defineInRange("armorToughness", 4.0D, 0.0D, 100.0D); + BRUTALFLY_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.7D, 0.0D, 1.0D); + BRUTALFLY_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.34D, 0.0D, 10.0D); + BRUTALFLY_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.55D, 0.0D, 10.0D); b.pop(); @@ -479,7 +545,6 @@ public final class AntarchyMobsConfig { ROLLY_POLLY_ROLL_SPEED_MULTIPLIER = b.comment("Speed multiplier while rolled up.") .defineInRange("rollSpeedMultiplier", 2.2D, 0.1D, 20.0D); ROLLY_POLLY_TAME_CHANCE = b.comment("Taming succeeds with a 1-in-N chance per food item.") .defineInRange("tameChance", 3, 1, 100); ROLLY_POLLY_BOWLING_DAMAGE = b.comment("Damage dealt by a tamed rolly polly's rolling bowling attack.") .defineInRange("bowlingDamage", 3.0D, 0.0D, 1024.0D); - ROLLY_POLLY_TUMBLE_DAMAGE = b.comment("Damage dealt by a tumbling rolly polly impact.").defineInRange("tumbleDamage", 3.0D, 0.0D, 1024.0D); ROLLY_POLLY_BOWLING_KNOCKBACK = b.comment("Knockback strength of a tamed rolly polly's rolling bowling attack.") .defineInRange("bowlingKnockback", 0.8D, 0.0D, 20.0D); ROLLY_POLLY_ARMOR = b.comment("Base armor value.") .defineInRange("armor", 2.0D, 0.0D, 100.0D); ROLLY_POLLY_ROLLED_ARMOR_BONUS = b.comment("Additional armor gained while rolled up.") .defineInRange("rolledArmorBonus", 16.0D, 0.0D, 100.0D); @@ -538,6 +603,17 @@ public final class AntarchyMobsConfig { 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); + NIGHTMARE_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.28D, 0.0D, 10.0D); + NIGHTMARE_WEAKNESS_TICKS = b.comment("Ticks the Weakness effect from Big Bertha's Nightmare-mode hit lasts.").defineInRange("weaknessTicks", 100, 0, 20000); + NIGHTMARE_DREAD_TICKS = b.comment("Ticks the Dread effect from Big Bertha's Nightmare-mode hit lasts.").defineInRange("dreadTicks", 160, 0, 20000); + b.pop(); + + b.push("dimensionalTear"); + DIMENSIONAL_TEAR_LIFETIME_TICKS = b.comment("Ticks before naturally generated linked Dimensional Tears collapse.").defineInRange("lifetimeTicks", 24000, 1200, 240000); + DIMENSIONAL_TEAR_INVERTED_DURATION_TICKS = b.comment("Ticks of Inverted applied to living entities exiting a Dimensional Tear.").defineInRange("invertedDurationTicks", 2400, 0, 240000); + DIMENSIONAL_TEAR_EMERGENCE_MIN_INTERVAL_TICKS = b.comment("Minimum ticks between Nightmare/Lucid emergence events per tear.").defineInRange("emergenceMinIntervalTicks", 2400, 20, 240000); + DIMENSIONAL_TEAR_EMERGENCE_MAX_INTERVAL_TICKS = b.comment("Maximum ticks between Nightmare/Lucid emergence events per tear.").defineInRange("emergenceMaxIntervalTicks", 7200, 20, 240000); + DIMENSIONAL_TEAR_LUCID_EVENT_CHANCE = b.comment("Chance that an emergence event spawns a Lucid instead of a Nightmare.").defineInRange("lucidEventChance", 0.65D, 0.0D, 1.0D); b.pop(); @@ -581,6 +657,11 @@ public final class AntarchyMobsConfig { LUCID_PEARL_INVERTED_DURATION_SECONDS = b .comment("How long the Inverted effect from a Lucid pearl lasts, in seconds.") .defineInRange("pearlInvertedDurationSeconds", 6.0D, 0.0D, 3600.0D); + LUCID_HEALTH = b.comment("Base max health.").defineInRange("health", 30.0D, 1.0D, 32768.0D); + LUCID_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 4.0D, 0.0D, 1024.0D); + LUCID_MOVEMENT_SPEED = b.comment("Base movement speed.").defineInRange("movementSpeed", 0.22D, 0.0D, 10.0D); + LUCID_FLYING_SPEED = b.comment("Base flying speed.").defineInRange("flyingSpeed", 0.35D, 0.0D, 10.0D); + LUCID_KNOCKBACK_RESISTANCE = b.comment("Base knockback resistance.").defineInRange("knockbackResistance", 0.5D, 0.0D, 1.0D); b.pop(); @@ -655,8 +736,6 @@ public final class AntarchyMobsConfig { TORETERROR_SPIN_DAMAGE = b.comment("Damage per spin-attack tick.").defineInRange("spinDamage", 8.0D, 0.0D, 1024.0D); TORETERROR_SPIN_KNOCKBACK = b.comment("Knockback strength of the spin attack.").defineInRange("spinKnockback", 1.5D, 0.0D, 10.0D); TORETERROR_PROJECTILE_DAMAGE_MULTIPLIER = b.comment("Damage multiplier applied to projectile hits on the Toreterror (0.5 = half damage).").defineInRange("projectileDamageMultiplier", 0.5D, 0.0D, 1.0D); - TORETERROR_RANGED_WATER_BOMB_CHANCE = b.comment("Chance each ranged attack cycle launches a water bomb.").defineInRange("rangedWaterBombChance", 0.35D, 0.0D, 1.0D); - WATER_CANNON_COOLDOWN_SECONDS = b.comment("Cooldown between water cannon uses, in seconds.").defineInRange("waterCannonCooldownSeconds", 1.5D, 0.0D, 60.0D); WATER_BOMB_DAMAGE = b.comment("Damage dealt by a Water Bomb hit.").defineInRange("waterBombDamage", 6.0D, 0.0D, 1024.0D); WATER_BOMB_LIFETIME_TICKS = b.comment("Ticks before a Water Bomb despawns.").defineInRange("waterBombLifetimeTicks", 120, 1, 6000); WATER_BOMB_GRAVITY = b.comment("Gravity applied to Water Bombs (higher = steeper arc).").defineInRange("waterBombGravity", 0.12D, 0.0D, 2.0D); @@ -717,25 +796,53 @@ public final class AntarchyMobsConfig { static double jumpyBugHealth() { return JUMPY_BUG_HEALTH.get(); } static double jumpyBugPounceDamage() { return JUMPY_BUG_POUNCE_DAMAGE.get(); } - static double jumpyBugLatchDamage() { return JUMPY_BUG_LATCH_DAMAGE.get(); } static double jumpyBugCamouflageAlpha() { return JUMPY_BUG_CAMOUFLAGE_ALPHA.get(); } + static double emperorScorpionHealth() { return EMPEROR_SCORPION_HEALTH.get(); } + static double emperorScorpionAttackDamage() { return EMPEROR_SCORPION_ATTACK_DAMAGE.get(); } + static double emperorScorpionMovementSpeed() { return EMPEROR_SCORPION_MOVEMENT_SPEED.get(); } + static double emperorScorpionArmor() { return EMPEROR_SCORPION_ARMOR.get(); } + static double emperorScorpionKnockbackResistance() { return EMPEROR_SCORPION_KNOCKBACK_RESISTANCE.get(); } + static double emperorScorpionFollowRange() { return EMPEROR_SCORPION_FOLLOW_RANGE.get(); } + static int emperorScorpionXpReward() { return EMPEROR_SCORPION_XP_REWARD.get(); } + static int emperorScorpionClawAnimTicks() { return EMPEROR_SCORPION_CLAW_ANIM_TICKS.get(); } + static int emperorScorpionClawHitTick() { return EMPEROR_SCORPION_CLAW_HIT_TICK.get(); } + static int emperorScorpionClawCooldownTicks() { return EMPEROR_SCORPION_CLAW_COOLDOWN_TICKS.get(); } + static int emperorScorpionStingAnimTicks() { return EMPEROR_SCORPION_STING_ANIM_TICKS.get(); } + static int emperorScorpionStingHitTick() { return EMPEROR_SCORPION_STING_HIT_TICK.get(); } + static int emperorScorpionStingCooldownTicks() { return EMPEROR_SCORPION_STING_COOLDOWN_TICKS.get(); } + static int emperorScorpionPoisonTicks() { return EMPEROR_SCORPION_POISON_TICKS.get(); } + static int emperorScorpionWeaknessTicks() { return EMPEROR_SCORPION_WEAKNESS_TICKS.get(); } + static int emperorScorpionSummonIntervalTicks() { return EMPEROR_SCORPION_SUMMON_INTERVAL_TICKS.get(); } + static int emperorScorpionMaxSummonedScorpions() { return EMPEROR_SCORPION_MAX_SUMMONED_SCORPIONS.get(); } + static int emperorScorpionMaxNearbyScorpions() { return EMPEROR_SCORPION_MAX_NEARBY_SCORPIONS.get(); } + static int emperorScorpionHardenCooldownTicks() { return EMPEROR_SCORPION_HARDEN_COOLDOWN_TICKS.get(); } static double emperorScorpionDamageRange() { return EMPEROR_SCORPION_DAMAGE_RANGE.get(); } static int emperorScorpionMinDespawnTicks() { return EMPEROR_SCORPION_MIN_DESPAWN_TICKS.get(); } static double krakenHealth() { return KRAKEN_HEALTH.get(); } static double krakenAttackDamage() { return KRAKEN_ATTACK_DAMAGE.get(); } - static double krakenProjectileDamageTakenMultiplier() { return KRAKEN_PROJECTILE_DAMAGE_TAKEN_MULTIPLIER.get(); } static boolean krakenSquidSpawnEnabled() { return KRAKEN_SQUID_SPAWN_ENABLED.get(); } static boolean krakenMassSpawnEnabled() { return KRAKEN_MASS_SPAWN_ENABLED.get(); } static boolean krakenRequireBadOmenToSummon() { return KRAKEN_REQUIRE_BAD_OMEN_TO_SUMMON.get(); } static double krakenFollowRange() { return KRAKEN_FOLLOW_RANGE.get(); } static double krakenDamageRange() { return KRAKEN_DAMAGE_RANGE.get(); } + static double krakenArmor() { return KRAKEN_ARMOR.get(); } + static double krakenKnockbackResistance() { return KRAKEN_KNOCKBACK_RESISTANCE.get(); } + static double krakenMovementSpeed() { return KRAKEN_MOVEMENT_SPEED.get(); } + static double krakenFlyingSpeed() { return KRAKEN_FLYING_SPEED.get(); } + static double krakenBossBarRange() { return KRAKEN_BOSS_BAR_RANGE.get(); } + static float krakenLightningDamagePhaseOne() { return KRAKEN_LIGHTNING_DAMAGE_PHASE_ONE.get().floatValue(); } static double brutalflyHealth() { return BRUTALFLY_HEALTH.get(); } static double brutalflySwipeDamage() { return BRUTALFLY_SWIPE_DAMAGE.get(); } static double brutalflySpitDamage() { return BRUTALFLY_SPIT_DAMAGE.get(); } static double brutalflyDamageRange() { return BRUTALFLY_DAMAGE_RANGE.get(); } + static double brutalflyArmor() { return BRUTALFLY_ARMOR.get(); } + static double brutalflyArmorToughness() { return BRUTALFLY_ARMOR_TOUGHNESS.get(); } + static double brutalflyKnockbackResistance() { return BRUTALFLY_KNOCKBACK_RESISTANCE.get(); } + static double brutalflyMovementSpeed() { return BRUTALFLY_MOVEMENT_SPEED.get(); } + static double brutalflyFlyingSpeed() { return BRUTALFLY_FLYING_SPEED.get(); } static double mantisHealth() { return MANTIS_HEALTH.get(); } static double mantisAttackDamage() { return MANTIS_ATTACK_DAMAGE.get(); } @@ -754,7 +861,6 @@ public final class AntarchyMobsConfig { static double rollyPollyRollSpeedMultiplier() { return ROLLY_POLLY_ROLL_SPEED_MULTIPLIER.get(); } static int rollyPollyTameChance() { return ROLLY_POLLY_TAME_CHANCE.get(); } static double rollyPollyBowlingDamage() { return ROLLY_POLLY_BOWLING_DAMAGE.get(); } - static double rollyPollyTumbleDamage() { return ROLLY_POLLY_TUMBLE_DAMAGE.get(); } static double rollyPollyBowlingKnockback() { return ROLLY_POLLY_BOWLING_KNOCKBACK.get(); } static double rollyPollyArmor() { return ROLLY_POLLY_ARMOR.get(); } static double rollyPollyRolledArmorBonus() { return ROLLY_POLLY_ROLLED_ARMOR_BONUS.get(); } @@ -782,6 +888,14 @@ public final class AntarchyMobsConfig { static double nightmareHealth() { return NIGHTMARE_HEALTH.get(); } static double nightmareAttackDamage() { return NIGHTMARE_ATTACK_DAMAGE.get(); } + static int dimensionalTearLifetimeTicks() { return DIMENSIONAL_TEAR_LIFETIME_TICKS.get(); } + static int dimensionalTearInvertedDurationTicks(){ return DIMENSIONAL_TEAR_INVERTED_DURATION_TICKS.get(); } + static int dimensionalTearEmergenceMinIntervalTicks() { return DIMENSIONAL_TEAR_EMERGENCE_MIN_INTERVAL_TICKS.get(); } + static int dimensionalTearEmergenceMaxIntervalTicks() { return DIMENSIONAL_TEAR_EMERGENCE_MAX_INTERVAL_TICKS.get(); } + static float dimensionalTearLucidEventChance() { return DIMENSIONAL_TEAR_LUCID_EVENT_CHANCE.get().floatValue(); } + static double nightmareMovementSpeed() { return NIGHTMARE_MOVEMENT_SPEED.get(); } + static int nightmareWeaknessTicks() { return NIGHTMARE_WEAKNESS_TICKS.get(); } + static int nightmareDreadTicks() { return NIGHTMARE_DREAD_TICKS.get(); } static boolean basiliskPetrifyingGazeEnabled() { return BASILISK_PETRIFYING_GAZE_ENABLED.get(); } static int basiliskSpawnMaxLightLevel() { return BASILISK_SPAWN_MAX_LIGHT_LEVEL.get(); } @@ -807,6 +921,11 @@ public final class AntarchyMobsConfig { static double lucidAttackRange() { return LUCID_ATTACK_RANGE.get(); } static double lucidPearlInvertedDurationSeconds() { return LUCID_PEARL_INVERTED_DURATION_SECONDS.get(); } + static double lucidHealth() { return LUCID_HEALTH.get(); } + static double lucidAttackDamage() { return LUCID_ATTACK_DAMAGE.get(); } + static double lucidMovementSpeed() { return LUCID_MOVEMENT_SPEED.get(); } + static double lucidFlyingSpeed() { return LUCID_FLYING_SPEED.get(); } + static double lucidKnockbackResistance() { return LUCID_KNOCKBACK_RESISTANCE.get(); } static double toreterrorHealth() { return TORETERROR_HEALTH.get(); } static double toreterrorDamageRange() { return TORETERROR_DAMAGE_RANGE.get(); } @@ -815,8 +934,6 @@ public final class AntarchyMobsConfig { static double toreterrorSpinDamage() { return TORETERROR_SPIN_DAMAGE.get(); } static double toreterrorSpinKnockback() { return TORETERROR_SPIN_KNOCKBACK.get(); } static double toreterrorProjectileDamageMultiplier() { return TORETERROR_PROJECTILE_DAMAGE_MULTIPLIER.get(); } - static double toreterrorRangedWaterBombChance() { return TORETERROR_RANGED_WATER_BOMB_CHANCE.get(); } - static double waterCannonCooldownSeconds() { return WATER_CANNON_COOLDOWN_SECONDS.get(); } static double waterBombDamage() { return WATER_BOMB_DAMAGE.get(); } static int waterBombLifetimeTicks() { return WATER_BOMB_LIFETIME_TICKS.get(); } static double waterBombGravity() { return WATER_BOMB_GRAVITY.get(); } diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java index 165e4497..e9379ae5 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java @@ -367,8 +367,11 @@ public class AntarchyNeoforge { ); AntarchyObjects.setOctopusBomb(AntarchyNeoforgeEntites.OCTOPUS_BOMB); AntarchyObjects.setTentacle(AntarchyNeoforgeEntites.TENTACLE); + AntarchyObjects.setNightmare(AntarchyNeoforgeEntites.NIGHTMARE); AntarchyObjects.setNightmarePortal(AntarchyNeoforgeEntites.NIGHTMARE_PORTAL); + AntarchyObjects.setDimensionalTear(AntarchyNeoforgeEntites.DIMENSIONAL_TEAR); AntarchyObjects.setNightmareBite(AntarchyNeoforgeEntites.NIGHTMARE_BITE); + AntarchyObjects.setLucid(AntarchyNeoforgeEntites.LUCID); AntarchyObjects.setKrakensGraspTrident(AntarchyNeoforgeEntites.KRAKENS_GRASP_TRIDENT); AntarchyObjects.setLotus(() -> AntarchyNeoforgeBlocks.LOTUS.get()); AntarchyObjects.setKrakenTentacle(() -> AntarchyNeoforgeItems.KRAKEN_TENTACLE.get()); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyToolsConfig.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyToolsConfig.java index 3e82ab89..967ef0b5 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyToolsConfig.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyToolsConfig.java @@ -106,8 +106,6 @@ public final class AntarchyToolsConfig { private static final ModConfigSpec.DoubleValue SCORPION_WHIP_PULL_STRENGTH; private static final ModConfigSpec.DoubleValue SCORPION_WHIP_HEAVY_PULL_MULTIPLIER; private static final ModConfigSpec.DoubleValue SCORPION_WHIP_SELF_PULL_MULTIPLIER; - private static final ModConfigSpec.IntValue SCORPION_WHIP_REEL_COOLDOWN_TICKS; - private static final ModConfigSpec.IntValue SCORPION_WHIP_SNAP_COOLDOWN_TICKS; private static final ModConfigSpec.IntValue BLOOD_CRYSTAL_KATANA_ATTACK_DAMAGE; private static final ModConfigSpec.DoubleValue BLOOD_CRYSTAL_KATANA_LAUNCH_STRENGTH; private static final ModConfigSpec.IntValue BLOOD_CRYSTAL_KATANA_TRAIL_DURATION_TICKS; @@ -124,8 +122,11 @@ public final class AntarchyToolsConfig { private static final ModConfigSpec.DoubleValue NIGHTMARE_LEGGINGS_ARMOR_TOUGHNESS; private static final ModConfigSpec.DoubleValue NIGHTMARE_BOOTS_ARMOR_TOUGHNESS; private static final ModConfigSpec.DoubleValue NIGHTMARE_ARMOR_KNOCKBACK_RESISTANCE; + private static final ModConfigSpec.DoubleValue NIGHTMARE_HELMET_DOUBLE_DAMAGE_CHANCE; + private static final ModConfigSpec.DoubleValue NIGHTMARE_CHESTPLATE_DOUBLE_DAMAGE_CHANCE; + private static final ModConfigSpec.DoubleValue NIGHTMARE_LEGGINGS_DOUBLE_DAMAGE_CHANCE; + private static final ModConfigSpec.DoubleValue NIGHTMARE_BOOTS_DOUBLE_DAMAGE_CHANCE; private static final ModConfigSpec.DoubleValue PRIMORDIAL_ARMOR_KNOCKBACK_PER_PIECE; - private static final ModConfigSpec.DoubleValue NIGHTMARE_ARMOR_DREAD_AURA_RANGE_PER_PIECE; private static final ModConfigSpec.DoubleValue NIGHTMARE_SWORD_BASE_DAMAGE; private static final ModConfigSpec.DoubleValue NIGHTMARE_SWORD_ATTACK_SPEED; private static final ModConfigSpec.DoubleValue NIGHTMARE_SWORD_SCALING_FACTOR; @@ -215,8 +216,6 @@ public final class AntarchyToolsConfig { // Moggles private static final ModConfigSpec.DoubleValue MOGGLES_VISION_RADIUS; - private static final ModConfigSpec.IntValue MOGGLES_VISION_MAX_LIGHT; - private static final ModConfigSpec.DoubleValue MOGGLES_VISION_ALPHA; static { @@ -354,8 +353,6 @@ public final class AntarchyToolsConfig { SCORPION_WHIP_PULL_STRENGTH = b.comment("Pull strength applied to normal tethered targets.").defineInRange("pullStrength", 0.75D, 0.0D, 8.0D); SCORPION_WHIP_HEAVY_PULL_MULTIPLIER = b.comment("Reduced pull strength applied to heavy targets.").defineInRange("heavyPullMultiplier", 0.25D, 0.0D, 8.0D); SCORPION_WHIP_SELF_PULL_MULTIPLIER = b.comment("Self-pull strength toward heavy tethered targets.").defineInRange("selfPullMultiplier", 0.45D, 0.0D, 8.0D); - SCORPION_WHIP_REEL_COOLDOWN_TICKS = b.comment("Cooldown after reeling with the whip, in ticks.").defineInRange("reelCooldownTicks", 10, 0, 72000); - SCORPION_WHIP_SNAP_COOLDOWN_TICKS = b.comment("Cooldown after snapping the whip, in ticks.").defineInRange("snapCooldownTicks", 30, 0, 72000); b.pop(); b.push("bloodCrystalKatana"); @@ -377,8 +374,11 @@ public final class AntarchyToolsConfig { NIGHTMARE_LEGGINGS_ARMOR_TOUGHNESS = b.comment("Armor toughness of the Nightmare Leggings.") .defineInRange("leggingsToughness", 3.0D, 0.0D, 100.0D); NIGHTMARE_BOOTS_ARMOR_TOUGHNESS = b.comment("Armor toughness of the Nightmare Boots.") .defineInRange("bootsToughness", 3.0D, 0.0D, 100.0D); NIGHTMARE_ARMOR_KNOCKBACK_RESISTANCE = b.comment("Knockback resistance granted by each Nightmare Armor piece.") .defineInRange("knockbackResistance", 0.1D, 0.0D, 1.0D); + NIGHTMARE_HELMET_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Helmet to double an incoming hit's damage.") .defineInRange("helmetDoubleDamageChance", 0.04D, 0.0D, 1.0D); + NIGHTMARE_CHESTPLATE_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Chestplate to double an incoming hit's damage.") .defineInRange("chestplateDoubleDamageChance", 0.06D, 0.0D, 1.0D); + NIGHTMARE_LEGGINGS_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Leggings to double an incoming hit's damage.") .defineInRange("leggingsDoubleDamageChance", 0.05D, 0.0D, 1.0D); + NIGHTMARE_BOOTS_DOUBLE_DAMAGE_CHANCE = b.comment("Chance for the Nightmare Boots to double an incoming hit's damage.") .defineInRange("bootsDoubleDamageChance", 0.03D, 0.0D, 1.0D); PRIMORDIAL_ARMOR_KNOCKBACK_PER_PIECE = b.comment("Attack knockback added by each Primordial Armor piece.") .defineInRange("primordialArmorKnockbackPerPiece", 0.5D, 0.0D, 16.0D); - NIGHTMARE_ARMOR_DREAD_AURA_RANGE_PER_PIECE = b.comment("Additional Dread aura range added by each Nightmare armor piece.").defineInRange("dreadAuraRangePerPiece", 2.0D, 0.0D, 64.0D); b.pop(); b.push("nightmareSword"); @@ -530,9 +530,7 @@ public final class AntarchyToolsConfig { b.pop(); b.push("moggles"); - MOGGLES_VISION_RADIUS = b.comment("Radius used by Moggles cave detection.").defineInRange("visionRadius", 20.0D, 1.0D, 128.0D); - MOGGLES_VISION_MAX_LIGHT = b.comment("Maximum block light level counted as dark enough for Moggles.").defineInRange("visionMaxLight", 7, 0, 15); - MOGGLES_VISION_ALPHA = b.comment("Overlay alpha used by Moggles vision rendering.").defineInRange("visionAlpha", 0.65D, 0.0D, 1.0D); + MOGGLES_VISION_RADIUS = b.comment("Search radius (in blocks) used by Moggles cave detection.").defineInRange("visionRadius", 20.0D, 1.0D, 128.0D); b.pop(); SPEC = b.build(); @@ -618,8 +616,6 @@ public final class AntarchyToolsConfig { static double scorpionWhipPullStrength() { return SCORPION_WHIP_PULL_STRENGTH.get(); } static double scorpionWhipHeavyPullMultiplier() { return SCORPION_WHIP_HEAVY_PULL_MULTIPLIER.get(); } static double scorpionWhipSelfPullMultiplier() { return SCORPION_WHIP_SELF_PULL_MULTIPLIER.get(); } - static int scorpionWhipReelCooldownTicks() { return SCORPION_WHIP_REEL_COOLDOWN_TICKS.get(); } - static int scorpionWhipSnapCooldownTicks() { return SCORPION_WHIP_SNAP_COOLDOWN_TICKS.get(); } static int bloodCrystalKatanaAttackDamage() { return BLOOD_CRYSTAL_KATANA_ATTACK_DAMAGE.get(); } static double bloodCrystalKatanaLaunchStrength() { return BLOOD_CRYSTAL_KATANA_LAUNCH_STRENGTH.get(); } static int bloodCrystalKatanaTrailDurationTicks() { return BLOOD_CRYSTAL_KATANA_TRAIL_DURATION_TICKS.get(); } @@ -633,8 +629,11 @@ public final class AntarchyToolsConfig { static double nightmareLeggingsArmorToughness() { return NIGHTMARE_LEGGINGS_ARMOR_TOUGHNESS.get(); } static double nightmareBootsArmorToughness() { return NIGHTMARE_BOOTS_ARMOR_TOUGHNESS.get(); } static double nightmareArmorKnockbackResistance() { return NIGHTMARE_ARMOR_KNOCKBACK_RESISTANCE.get(); } + static double nightmareHelmetDoubleDamageChance() { return NIGHTMARE_HELMET_DOUBLE_DAMAGE_CHANCE.get(); } + static double nightmareChestplateDoubleDamageChance() { return NIGHTMARE_CHESTPLATE_DOUBLE_DAMAGE_CHANCE.get(); } + static double nightmareLeggingsDoubleDamageChance() { return NIGHTMARE_LEGGINGS_DOUBLE_DAMAGE_CHANCE.get(); } + static double nightmareBootsDoubleDamageChance() { return NIGHTMARE_BOOTS_DOUBLE_DAMAGE_CHANCE.get(); } static double primordialArmorKnockbackPerPiece() { return PRIMORDIAL_ARMOR_KNOCKBACK_PER_PIECE.get(); } - static double nightmareArmorDreadAuraRangePerPiece() { return NIGHTMARE_ARMOR_DREAD_AURA_RANGE_PER_PIECE.get(); } static double nightmareSwordBaseDamage() { return NIGHTMARE_SWORD_BASE_DAMAGE.get(); } static double nightmareSwordAttackSpeed() { return NIGHTMARE_SWORD_ATTACK_SPEED.get(); } static double nightmareSwordScalingFactor() { return NIGHTMARE_SWORD_SCALING_FACTOR.get(); } @@ -701,8 +700,6 @@ public final class AntarchyToolsConfig { static int americanRegenerationDurationTicks() { return AMERICAN_REGENERATION_DURATION_TICKS.get(); } static int americanRegenerationAmplifier() { return AMERICAN_REGENERATION_AMPLIFIER.get(); } static double mogglesVisionRadius() { return MOGGLES_VISION_RADIUS.get(); } - static int mogglesVisionMaxLight() { return MOGGLES_VISION_MAX_LIGHT.get(); } - static double mogglesVisionAlpha() { return MOGGLES_VISION_ALPHA.get(); } } diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyWoodTypes.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyWoodTypes.java index d361610a..ba506aa6 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyWoodTypes.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyWoodTypes.java @@ -7,6 +7,7 @@ import net.minecraft.world.level.block.state.properties.WoodType; public final class AntarchyWoodTypes { public static final WoodType OURANWOOD = register("ouranwood"); public static final WoodType PEACH = register("peach"); + public static final WoodType NADIR = register("nadir"); private AntarchyWoodTypes() { } diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java index b915f2c9..a15f9acb 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java @@ -76,6 +76,8 @@ public final class AntarchyNeoForgeClient { private static final ResourceLocation OURANWOOD_CHEST_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/ouranwood.png"); private static final ResourceLocation PEACH_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/peach.png"); private static final ResourceLocation PEACH_CHEST_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/peach.png"); + private static final ResourceLocation NADIR_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/nadir.png"); + private static final ResourceLocation NADIR_CHEST_BOAT_TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/chest_boat/nadir.png"); private static final ResourceLocation WATER_STILL = ResourceLocation.withDefaultNamespace("block/water_still"); private static final ResourceLocation WATER_FLOW = ResourceLocation.withDefaultNamespace("block/water_flow"); private static final ResourceLocation WATER_OVERLAY = ResourceLocation.withDefaultNamespace("block/water_overlay"); @@ -111,6 +113,8 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.OURANWOOD_CHEST_BOAT_ENTITY.get(), context -> new OuranwoodBoatRenderer<>(context, OURANWOOD_CHEST_BOAT_TEXTURE, true)); event.registerEntityRenderer(AntarchyNeoforgeEntites.PEACH_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, PEACH_BOAT_TEXTURE, false)); event.registerEntityRenderer(AntarchyNeoforgeEntites.PEACH_CHEST_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, PEACH_CHEST_BOAT_TEXTURE, true)); + event.registerEntityRenderer(AntarchyNeoforgeEntites.NADIR_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, NADIR_BOAT_TEXTURE, false)); + event.registerEntityRenderer(AntarchyNeoforgeEntites.NADIR_CHEST_BOAT_ENTITY.get(), context -> new PeachBoatRenderer<>(context, NADIR_CHEST_BOAT_TEXTURE, true)); event.registerEntityRenderer(AntarchyNeoforgeEntites.APPLE_COW.get(), context -> withParalyzedGeoLayer(new AppleCowRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.GOLDEN_APPLE_COW.get(), context -> withParalyzedGeoLayer(new AppleCowRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.ENCHANTED_GOLDEN_APPLE_COW.get(), context -> withParalyzedGeoLayer(new AppleCowRenderer(context))); @@ -124,6 +128,7 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.OCTOPUS_BOMB.get(), context -> withParalyzedGeoLayer(new OctopusBombRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.NIGHTMARE.get(), context -> withParalyzedGeoLayer(new NightmareRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.NIGHTMARE_PORTAL.get(), NightmarePortalRenderer::new); + event.registerEntityRenderer(AntarchyNeoforgeEntites.DIMENSIONAL_TEAR.get(), DimensionalTearRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.NIGHTMARE_BITE.get(), NightmareBiteRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.LUCID.get(), context -> withParalyzedGeoLayer(new LucidRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.BED_BUG.get(), context -> withParalyzedGeoLayer(new BedBugRenderer(context))); @@ -571,6 +576,11 @@ public final class AntarchyNeoForgeClient { ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PEACH_TRAPDOOR.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PEACH_SAPLING.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.POTTED_PEACH_SAPLING.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.NADIR_VEIL.get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.NADIR_DOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.NADIR_TRAPDOOR.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.NADIR_SAPLING.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.POTTED_NADIR_SAPLING.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.DUPLICATOR_SAPLING.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ORANGE_MILKWEED.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PINK_MILKWEED.get(), RenderType.cutout()); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java index 440b9180..d93443f4 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoForgeEvents.java @@ -1324,6 +1324,7 @@ public final class AntarchyNeoForgeEvents { ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.CORNEA_EAR.get(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeBlocks.PEACH_LEAVES.get().asItem(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.PEACH_SAPLING_ITEM.get(), 0.3f); + ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.NADIR_SAPLING_ITEM.get(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.CORN.get(), 0.65f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.CORN_SEEDS.get(), 0.3f); ComposterBlock.COMPOSTABLES.put(AntarchyNeoforgeItems.PEACH.get(), 0.65f); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java index 8478c652..380f167f 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeBlocks.java @@ -153,6 +153,46 @@ public final class AntarchyNeoforgeBlocks { () -> new CeilingHangingSignBlock(AntarchyWoodTypes.PEACH, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_HANGING_SIGN))); public static final DeferredBlock PEACH_WALL_HANGING_SIGN = BLOCKS.register("peach_wall_hanging_sign", () -> new WallHangingSignBlock(AntarchyWoodTypes.PEACH, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WALL_HANGING_SIGN))); + public static final DeferredBlock NADIR_LOG = BLOCKS.register("nadir_log", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LOG))); + public static final DeferredBlock NADIR_WOOD = BLOCKS.register("nadir_wood", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WOOD))); + public static final DeferredBlock STRIPPED_NADIR_LOG = BLOCKS.register("stripped_nadir_log", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STRIPPED_JUNGLE_LOG))); + public static final DeferredBlock STRIPPED_NADIR_WOOD = BLOCKS.register("stripped_nadir_wood", + () -> new RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STRIPPED_JUNGLE_WOOD))); + public static final DeferredBlock NADIR_PLANKS = BLOCKS.register("nadir_planks", + () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_PLANKS))); + public static final DeferredBlock NADIR_STAIRS = BLOCKS.register("nadir_stairs", + () -> new StairBlock(NADIR_PLANKS.get().defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_STAIRS))); + public static final DeferredBlock NADIR_SLAB = BLOCKS.register("nadir_slab", + () -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_SLAB))); + public static final DeferredBlock NADIR_FENCE = BLOCKS.register("nadir_fence", + () -> new FenceBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_FENCE))); + public static final DeferredBlock NADIR_FENCE_GATE = BLOCKS.register("nadir_fence_gate", + () -> new FenceGateBlock(WoodType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_FENCE_GATE))); + public static final DeferredBlock NADIR_DOOR = BLOCKS.register("nadir_door", + () -> new DoorBlock(BlockSetType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_DOOR))); + public static final DeferredBlock NADIR_TRAPDOOR = BLOCKS.register("nadir_trapdoor", + () -> new TrapDoorBlock(BlockSetType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_TRAPDOOR))); + public static final DeferredBlock NADIR_PRESSURE_PLATE = BLOCKS.register("nadir_pressure_plate", + () -> new PressurePlateBlock(BlockSetType.JUNGLE, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_PRESSURE_PLATE))); + public static final DeferredBlock NADIR_BUTTON = BLOCKS.register("nadir_button", + () -> new ButtonBlock(BlockSetType.JUNGLE, 30, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_BUTTON))); + public static final DeferredBlock NADIR_VEIL = BLOCKS.register("nadir_veil", + () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).sound(SoundType.SLIME_BLOCK).noOcclusion())); + public static final DeferredBlock NADIR_SAPLING = BLOCKS.register("nadir_sapling", + () -> new NadirSaplingBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SAPLING).randomTicks().noCollission())); + public static final DeferredBlock POTTED_NADIR_SAPLING = BLOCKS.register("potted_nadir_sapling", + () -> new FlowerPotBlock(NADIR_SAPLING.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.POTTED_DANDELION))); + public static final DeferredBlock NADIR_SIGN = BLOCKS.register("nadir_sign", + () -> new StandingSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_SIGN))); + public static final DeferredBlock NADIR_WALL_SIGN = BLOCKS.register("nadir_wall_sign", + () -> new WallSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WALL_SIGN))); + public static final DeferredBlock NADIR_HANGING_SIGN = BLOCKS.register("nadir_hanging_sign", + () -> new CeilingHangingSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_HANGING_SIGN))); + public static final DeferredBlock NADIR_WALL_HANGING_SIGN = BLOCKS.register("nadir_wall_hanging_sign", + () -> new WallHangingSignBlock(AntarchyWoodTypes.NADIR, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_WALL_HANGING_SIGN))); public static final DeferredBlock DUPLICATOR_SAPLING = BLOCKS.register("duplicator_sapling", () -> new DuplicatorSaplingBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SAPLING).randomTicks().noCollission())); public static final DeferredBlock DUCT_TAPE = BLOCKS.register("duct_tape", diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java index 3d5cc50a..a2bfa3a7 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntites.java @@ -30,6 +30,8 @@ import com.craisinlord.antarchy.content.entity.MolevoreEntity; import com.craisinlord.antarchy.content.entity.MolewormEntity; import com.craisinlord.antarchy.content.entity.OuranwoodBoatEntity; import com.craisinlord.antarchy.content.entity.OuranwoodChestBoatEntity; +import com.craisinlord.antarchy.content.entity.NadirBoatEntity; +import com.craisinlord.antarchy.content.entity.NadirChestBoatEntity; import com.craisinlord.antarchy.content.entity.PeachBoatEntity; import com.craisinlord.antarchy.content.entity.PeachChestBoatEntity; import com.craisinlord.antarchy.content.entity.ReverieEntity; @@ -59,6 +61,7 @@ import com.craisinlord.antarchy.content.entity.lucid.LucidEyeProjectileEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmarePortalEntity; import com.craisinlord.antarchy.content.entity.nightmare.NightmareBiteEntity; +import com.craisinlord.antarchy.content.entity.portal.DimensionalTearEntity; import com.craisinlord.antarchy.content.entity.CheepEntity; import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity; import com.craisinlord.antarchy.content.entity.DorrieEntity; @@ -139,6 +142,18 @@ public final class AntarchyNeoforgeEntites { .clientTrackingRange(10) .updateInterval(10) .build("peach_chest_boat")); + public static final DeferredHolder, EntityType> NADIR_BOAT_ENTITY = ENTITY_TYPES.register("nadir_boat", + () -> EntityType.Builder.of(NadirBoatEntity::new, MobCategory.MISC) + .sized(1.375F, 0.5625F) + .clientTrackingRange(10) + .updateInterval(10) + .build("nadir_boat")); + public static final DeferredHolder, EntityType> NADIR_CHEST_BOAT_ENTITY = ENTITY_TYPES.register("nadir_chest_boat", + () -> EntityType.Builder.of(NadirChestBoatEntity::new, MobCategory.MISC) + .sized(1.375F, 0.5625F) + .clientTrackingRange(10) + .updateInterval(10) + .build("nadir_chest_boat")); public static final DeferredHolder, EntityType> MOLEVORE = ENTITY_TYPES.register("molevore", () -> EntityType.Builder.of(MolevoreEntity::new, MobCategory.MONSTER) .sized(1.95F, 1.1F) @@ -274,6 +289,12 @@ public final class AntarchyNeoforgeEntites { .clientTrackingRange(10) .updateInterval(1) .build("nightmare_portal")); + public static final DeferredHolder, EntityType> DIMENSIONAL_TEAR = ENTITY_TYPES.register("dimensional_tear", + () -> EntityType.Builder.of(DimensionalTearEntity::new, MobCategory.MISC) + .sized(2.8F, 3.2F) + .clientTrackingRange(12) + .updateInterval(1) + .build("dimensional_tear")); public static final DeferredHolder, EntityType> NIGHTMARE_BITE = ENTITY_TYPES.register("nightmare_bite", () -> EntityType.Builder.of(NightmareBiteEntity::new, MobCategory.MISC) .sized(2.5F, 2.0F) diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java index 6b7fc1ee..d054e0ad 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java @@ -192,6 +192,21 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem PEACH_BUTTON_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PEACH_BUTTON); public static final DeferredItem PEACH_LEAVES_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PEACH_LEAVES); public static final DeferredItem PEACH_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PEACH_SAPLING); + public static final DeferredItem NADIR_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_LOG); + public static final DeferredItem NADIR_WOOD_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_WOOD); + public static final DeferredItem STRIPPED_NADIR_LOG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.STRIPPED_NADIR_LOG); + public static final DeferredItem STRIPPED_NADIR_WOOD_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.STRIPPED_NADIR_WOOD); + public static final DeferredItem NADIR_PLANKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_PLANKS); + public static final DeferredItem NADIR_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_STAIRS); + public static final DeferredItem NADIR_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_SLAB); + public static final DeferredItem NADIR_FENCE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_FENCE); + public static final DeferredItem NADIR_FENCE_GATE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_FENCE_GATE); + public static final DeferredItem NADIR_DOOR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_DOOR); + public static final DeferredItem NADIR_TRAPDOOR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_TRAPDOOR); + public static final DeferredItem NADIR_PRESSURE_PLATE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_PRESSURE_PLATE); + public static final DeferredItem NADIR_BUTTON_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_BUTTON); + public static final DeferredItem NADIR_VEIL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_VEIL); + public static final DeferredItem NADIR_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NADIR_SAPLING); public static final DeferredItem ORANGE_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.ORANGE_MILKWEED); public static final DeferredItem PINK_MILKWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PINK_MILKWEED); public static final DeferredItem CAMELLIA_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CAMELLIA); @@ -218,6 +233,14 @@ public final class AntarchyNeoforgeItems { () -> new PeachBoatOnlyItem(AntarchyNeoforgeEntites.PEACH_BOAT_ENTITY.get(), new Item.Properties().stacksTo(1))); public static final DeferredItem PEACH_CHEST_BOAT = ITEMS.register("peach_chest_boat", () -> new PeachChestBoatItem(AntarchyNeoforgeEntites.PEACH_CHEST_BOAT_ENTITY.get(), new Item.Properties().stacksTo(1))); + public static final DeferredItem NADIR_SIGN_ITEM = ITEMS.register("nadir_sign", + () -> new net.minecraft.world.item.SignItem(new Item.Properties().stacksTo(16), AntarchyNeoforgeBlocks.NADIR_SIGN.get(), AntarchyNeoforgeBlocks.NADIR_WALL_SIGN.get())); + public static final DeferredItem NADIR_HANGING_SIGN_ITEM = ITEMS.register("nadir_hanging_sign", + () -> new net.minecraft.world.item.HangingSignItem(AntarchyNeoforgeBlocks.NADIR_HANGING_SIGN.get(), AntarchyNeoforgeBlocks.NADIR_WALL_HANGING_SIGN.get(), new Item.Properties().stacksTo(16))); + public static final DeferredItem NADIR_BOAT = ITEMS.register("nadir_boat", + () -> new NadirBoatOnlyItem(AntarchyNeoforgeEntites.NADIR_BOAT_ENTITY.get(), new Item.Properties().stacksTo(1))); + public static final DeferredItem NADIR_CHEST_BOAT = ITEMS.register("nadir_chest_boat", + () -> new NadirChestBoatItem(AntarchyNeoforgeEntites.NADIR_CHEST_BOAT_ENTITY.get(), new Item.Properties().stacksTo(1))); public static final DeferredItem CRITTER_CAGE = ITEMS.register("critter_cage", () -> new CritterCageItem(new Item.Properties().stacksTo(16))); public static final DeferredItem DUPLICATOR_SAPLING_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.DUPLICATOR_SAPLING); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java index c1114a3f..4658b0be 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeMisc.java @@ -356,6 +356,8 @@ public final class AntarchyNeoforgeMisc { () -> new LucidAntiwaterPoolFeature(ThoraxisAntiwaterPoolConfiguration.CODEC)); public static final DeferredHolder, ThoraxisDuneFeature> THORAXIS_DUNE = FEATURES.register("thoraxis_dune", () -> new ThoraxisDuneFeature(ThoraxisDuneConfiguration.CODEC)); + public static final DeferredHolder, DimensionalTearFeature> DIMENSIONAL_TEAR = FEATURES.register("dimensional_tear", + () -> new DimensionalTearFeature(NoneFeatureConfiguration.CODEC)); // Biome sources public static final DeferredHolder, MapCodec> ELYTHIA_BIOME_SOURCE = BIOME_SOURCES.register("elythia_biome_source",