From 8812938d7996f4ce771b2327ad908e01b7e08a2c Mon Sep 17 00:00:00 2001 From: craisinlord Date: Fri, 11 Sep 2026 23:47:01 -0500 Subject: [PATCH] renamed mobs feather rising and chronosphere enchants underside ruins structure --- .../antarchy/config/AntarchySettings.java | 100 ++++---- .../antarchy/content/AntarchyObjects.java | 42 ++-- .../antarchy/content/AntarchySoundEvents.java | 126 +++++----- .../antarchy/content/AntarchyTags.java | 2 +- ...Block.java => CrawlingBlightEggBlock.java} | 20 +- ...ffidGooBlock.java => FlytrapGooBlock.java} | 4 +- .../block/QueenTrailSpawnMarkerBlock.java | 54 ++++ ...Block.java => SkulkingFrightEggBlock.java} | 20 +- ...ugEggBlock.java => SpringbugEggBlock.java} | 18 +- .../content/block/UnderVaultBlock.java | 77 ++++++ .../content/block/UndertrialSpawnerBlock.java | 79 ++++++ .../QueenTrailSpawnMarkerBlockEntity.java | 97 +++++++ .../block/entity/UnderVaultBlockEntity.java | 97 +++++++ .../entity/UndertrialSpawnerBlockEntity.java | 144 +++++++++++ ...rorModel.java => CrawlingBlightModel.java} | 16 +- .../{TriffidModel.java => FlytrapModel.java} | 16 +- .../client/model/LurkingTerrorModel.java | 23 -- .../client/model/SkulkingFrightModel.java | 23 ++ ...JumpyBugModel.java => SpringbugModel.java} | 18 +- ...dSharkModel.java => StratosharkModel.java} | 18 +- .../client/particle/UndertrialParticle.java | 73 ++++++ ...derer.java => CrawlingBlightRenderer.java} | 12 +- .../client/renderer/FlytrapRenderer.java | 18 ++ .../renderer/LurkingTerrorRenderer.java | 14 -- .../renderer/SkulkingFrightRenderer.java | 14 ++ ...ugRenderer.java => SpringbugRenderer.java} | 28 +-- ...Renderer.java => StratosharkRenderer.java} | 22 +- .../client/renderer/TriffidRenderer.java | 18 -- .../client/renderer/UnderVaultRenderer.java | 21 ++ .../renderer/UndertrialSpawnerRenderer.java | 35 +++ .../content/command/QueenLocateCommand.java | 101 ++++++++ .../content/creative/CreativeTabContents.java | 31 +-- .../content/damage/AntarchyDamageSources.java | 12 +- .../content/damage/AntarchyDamageTypes.java | 12 +- .../enchantment/AntarchyEnchantments.java | 47 ++++ ...rEntity.java => CrawlingBlightEntity.java} | 24 +- ...{TriffidEntity.java => FlytrapEntity.java} | 56 ++--- ...rEntity.java => SkulkingFrightEntity.java} | 24 +- ...mpyBugEntity.java => SpringbugEntity.java} | 198 +++++++-------- .../lucid/LucidEyeProjectileEntity.java | 4 +- .../entity/portal/DimensionalTearEntity.java | 14 +- .../content/entity/royal/KingEntity.java | 113 +++++++++ .../content/entity/royal/QueenEntity.java | 71 ++++++ .../content/entity/royal/RoyalBossEntity.java | 7 +- .../SharknadoManager.java | 34 +-- .../StratosharkEntity.java} | 40 +-- .../gravity/AntarchyGravityAccess.java | 2 + .../content/gravity/AntarchyGravityApi.java | 4 + .../content/item/BloodCrystalArmorItem.java | 23 +- ...lockItem.java => FlytrapGooBlockItem.java} | 6 +- .../content/item/JerryNucleusItem.java | 18 +- .../content/item/MinersDreamExcavation.java | 4 +- .../content/item/RoyalAssailantArmorItem.java | 3 - ...otsHelper.java => SpringyBootsHelper.java} | 6 +- ...pyBootsItem.java => SpringyBootsItem.java} | 10 +- ...pItem.java => StratosharkFinSoupItem.java} | 6 +- .../content/item/royal/RoyalGearHelper.java | 11 +- .../network/JumpyBootsLaunchPayload.java | 24 -- .../network/SpringyBootsLaunchPayload.java | 24 ++ .../content/time/ChronosphereManager.java | 65 +++++ .../content/time/TimeDilationApi.java | 10 +- .../time/TimeDilationEntityAccess.java | 2 + .../content/time/TimeDilationFieldEntity.java | 33 +++ .../content/time/TimeDilationManager.java | 1 + .../cavaryn/CavarynEggPatchFeature.java | 18 +- ...e.java => SpringbugEggCeilingFeature.java} | 14 +- ...hFeature.java => FlytrapPatchFeature.java} | 20 +- .../elythia/KingsTreeGridFeature.java | 42 +++- .../thoraxis/QueenHavocTrailFeature.java | 237 ++++++++++++++++++ .../worldgen/thoraxis/QueenTrailGrid.java | 38 +++ .../ThoraxisTransitionThroatFeature.java | 83 ++++++ .../thoraxis/ThoraxisUndersideManager.java | 143 ++++++++++- .../gravity/AbstractArrowGravityMixin.java | 4 +- .../gravity/CrossbowItemGravityMixin.java | 5 +- .../mixins/gravity/EntityGravityMixin.java | 10 + .../mixins/gravity/EntityMoveMixin.java | 44 +++- .../gravity/ProjectileGravityMixin.java | 32 ++- .../ThrowableProjectileGravityMixin.java | 4 +- .../time/EntityTimeDilationStateMixin.java | 15 +- ...ivingEntityChronosphereEquipmentMixin.java | 21 ++ .../LivingEntityFoodUseTimeDilationMixin.java | 30 +++ .../time/PlayerCooldownTimeDilationMixin.java | 20 ++ .../resources/antarchy-common.mixins.json | 5 +- ...on.json => crawling_blight.animation.json} | 0 ....animation.json => flytrap.animation.json} | 0 ...on.json => skulking_fright.animation.json} | 0 ...nimation.json => springbug.animation.json} | 0 ...mation.json => stratoshark.animation.json} | 0 .../blockstates/crawling_blight_egg.json | 76 ++++++ .../blockstates/creeping_horror_egg.json | 76 ------ .../blockstates/flytrap_goo_block.json | 7 + .../blockstates/lurking_terror_egg.json | 76 ------ .../blockstates/skulking_fright_egg.json | 76 ++++++ ...{jumpy_bug_egg.json => springbug_egg.json} | 8 +- .../blockstates/triffid_goo_block.json | 7 - .../blockstates/undertrial_spawner.json | 10 + .../antarchy/blockstates/undervault.json | 28 +++ ...rror.geo.json => crawling_blight.geo.json} | 2 +- .../{triffid.geo.json => flytrap.geo.json} | 2 +- ...rror.geo.json => skulking_fright.geo.json} | 2 +- ...{jumpy_bug.geo.json => springbug.geo.json} | 2 +- ...ud_shark.geo.json => stratoshark.geo.json} | 0 .../resources/assets/antarchy/lang/de_de.json | 98 ++++---- .../resources/assets/antarchy/lang/en_us.json | 107 ++++---- .../resources/assets/antarchy/lang/es_es.json | 98 ++++---- .../resources/assets/antarchy/lang/fr_fr.json | 98 ++++---- .../resources/assets/antarchy/lang/it_it.json | 98 ++++---- .../resources/assets/antarchy/lang/ja_jp.json | 98 ++++---- .../resources/assets/antarchy/lang/ko_kr.json | 98 ++++---- .../resources/assets/antarchy/lang/pt_br.json | 98 ++++---- .../resources/assets/antarchy/lang/ru_ru.json | 58 ++--- .../resources/assets/antarchy/lang/zh_cn.json | 98 ++++---- .../resources/assets/antarchy/lang/zh_tw.json | 98 ++++---- ..._egg_1.json => crawling_blight_egg_1.json} | 2 +- ..._egg_2.json => crawling_blight_egg_2.json} | 2 +- ..._egg_3.json => crawling_blight_egg_3.json} | 2 +- .../models/block/crawling_blight_egg_4.json | 7 + .../models/block/creeping_horror_egg_4.json | 7 - ..._goo_block.json => flytrap_goo_block.json} | 6 +- .../models/block/lurking_terror_egg_4.json | 7 - ..._egg_1.json => skulking_fright_egg_1.json} | 2 +- ..._egg_2.json => skulking_fright_egg_2.json} | 2 +- ..._egg_3.json => skulking_fright_egg_3.json} | 2 +- .../models/block/skulking_fright_egg_4.json | 7 + ...ightly_cracked_crawling_blight_egg_1.json} | 2 +- ...ightly_cracked_crawling_blight_egg_2.json} | 2 +- ...ightly_cracked_crawling_blight_egg_3.json} | 2 +- ...lightly_cracked_crawling_blight_egg_4.json | 7 + ...lightly_cracked_creeping_horror_egg_4.json | 7 - ...slightly_cracked_lurking_terror_egg_1.json | 6 - ...slightly_cracked_lurking_terror_egg_2.json | 6 - ...slightly_cracked_lurking_terror_egg_3.json | 6 - ...slightly_cracked_lurking_terror_egg_4.json | 7 - ...lightly_cracked_skulking_fright_egg_1.json | 6 + ...lightly_cracked_skulking_fright_egg_2.json | 6 + ...lightly_cracked_skulking_fright_egg_3.json | 6 + ...lightly_cracked_skulking_fright_egg_4.json | 7 + .../antarchy/models/block/spit_bug_egg.json | 2 +- ...{jumpy_bug_egg.json => springbug_egg.json} | 6 +- .../block/undertrial_spawner_active.json | 1 + .../undertrial_spawner_ejecting_reward.json | 1 + .../block/undertrial_spawner_inactive.json | 1 + .../models/block/undervault_ejecting.json | 1 + .../models/block/undervault_inner_faces.json | 30 +++ .../antarchy/models/block/undervault_off.json | 1 + .../antarchy/models/block/undervault_on.json | 1 + ...> very_cracked_crawling_blight_egg_1.json} | 2 +- ...> very_cracked_crawling_blight_egg_2.json} | 2 +- ...> very_cracked_crawling_blight_egg_3.json} | 2 +- .../very_cracked_crawling_blight_egg_4.json | 7 + .../very_cracked_creeping_horror_egg_4.json | 7 - .../very_cracked_lurking_terror_egg_1.json | 6 - .../very_cracked_lurking_terror_egg_2.json | 6 - .../very_cracked_lurking_terror_egg_4.json | 7 - .../very_cracked_skulking_fright_egg_1.json | 6 + .../very_cracked_skulking_fright_egg_2.json | 6 + ...> very_cracked_skulking_fright_egg_3.json} | 2 +- .../very_cracked_skulking_fright_egg_4.json | 7 + ...rror_egg.json => crawling_blight_egg.json} | 2 +- ...gg.json => crawling_blight_spawn_egg.json} | 0 .../{jumpy_boots.json => flytrap_goo.json} | 2 +- .../models/item/flytrap_goo_block.json | 3 + ..._spawn_egg.json => flytrap_spawn_egg.json} | 0 .../models/item/lurking_terror_egg.json | 6 - .../models/item/skulking_fright_egg.json | 6 + ...gg.json => skulking_fright_spawn_egg.json} | 0 ...{jumpy_bug_egg.json => springbug_egg.json} | 2 +- ...{jumpy_bug_leg.json => springbug_leg.json} | 2 +- ...pawn_egg.json => springbug_spawn_egg.json} | 0 .../{triffid_goo.json => springy_boots.json} | 2 +- ...ud_shark_fin.json => stratoshark_fin.json} | 2 +- ...in_soup.json => stratoshark_fin_soup.json} | 2 +- ...wn_egg.json => stratoshark_spawn_egg.json} | 0 .../models/item/triffid_goo_block.json | 3 - .../antarchy/models/item/undertrial_key.json | 1 + .../models/item/undertrial_spawner.json | 1 + .../antarchy/models/item/undervault.json | 1 + .../antarchy/particles/undertrial_omen.json | 3 + .../undertrial_spawner_detection.json | 9 + .../particles/undervault_connection.json | 1 + .../resources/assets/antarchy/sounds.json | 164 ++++++------ .../crawling_blight_bite1.ogg} | Bin .../crawling_blight_bite2.ogg} | Bin .../crawling_blight_bite3.ogg} | Bin .../crawling_blight_bite4.ogg} | Bin .../crawling_blight_growl1.ogg} | Bin .../crawling_blight_growl2.ogg} | Bin .../crawling_blight_hurt1.ogg} | Bin .../crawling_blight_hurt2.ogg} | Bin .../flytrap_attack1.ogg} | Bin .../flytrap_grab1.ogg} | Bin .../flytrap_growl1.ogg} | Bin .../flytrap_growl2.ogg} | Bin .../flytrap_hiss1.ogg} | Bin .../flytrap_hurt1.ogg} | Bin .../flytrap_hurt2.ogg} | Bin .../flytrap_hurt3.ogg} | Bin .../skulking_fright_bite1.ogg} | Bin .../skulking_fright_fly_loop.ogg} | Bin .../skulking_fright_hurt1.ogg} | Bin .../skulking_fright_hurt2.ogg} | Bin .../skulking_fright_snarl1.ogg} | Bin .../skulking_fright_snarl2.ogg} | Bin .../hurt1.ogg} | Bin .../hurt2.ogg} | Bin .../mob/{jumpy_bug => springbug}/idle1.ogg | Bin .../mob/{jumpy_bug => springbug}/idle2.ogg | Bin .../mob/{jumpy_bug => springbug}/idle3.ogg | Bin .../mob/{jumpy_bug => springbug}/idle4.ogg | Bin .../mob/{jumpy_bug => springbug}/jump1.ogg | Bin .../mob/{jumpy_bug => springbug}/jump2.ogg | Bin .../mob/{jumpy_bug => springbug}/jump3.ogg | Bin .../stratoshark_bite.ogg} | Bin .../stratoshark_death.ogg} | Bin .../stratoshark_fly1.ogg} | Bin .../stratoshark_hurt.ogg} | Bin .../stratoshark_idle1.ogg} | Bin .../stratoshark_idle2.ogg} | Bin .../stratoshark_idle3.ogg} | Bin .../stratoshark_idle4.ogg} | Bin .../crawling_blight_egg.png} | Bin .../crawling_blight_egg_slightly_cracked.png} | Bin .../crawling_blight_egg_very_cracked.png} | Bin ...id_goo_block.png => flytrap_goo_block.png} | Bin .../skulking_fright_egg.png} | Bin .../skulking_fright_egg_slightly_cracked.png} | Bin .../skulking_fright_egg_very_cracked.png} | Bin .../{jumpy_bug_egg.png => springbug_egg.png} | Bin ...gg.png.mcmeta => springbug_egg.png.mcmeta} | 0 .../undertrial_spawner_bottom.png | Bin 0 -> 422 bytes .../undertrial_spawner_side_active.png | Bin 0 -> 454 bytes .../undertrial_spawner_side_inactive.png | Bin 0 -> 459 bytes .../undertrial_spawner_top_active.png | Bin 0 -> 477 bytes ...undertrial_spawner_top_ejecting_reward.png | Bin 0 -> 463 bytes .../undertrial_spawner_top_inactive.png | Bin 0 -> 489 bytes .../block/undervault/undervault_bottom.png | Bin 0 -> 157 bytes .../undervault/undervault_front_ejecting.png | Bin 0 -> 536 bytes .../block/undervault/undervault_front_off.png | Bin 0 -> 546 bytes .../block/undervault/undervault_front_on.png | Bin 0 -> 557 bytes .../block/undervault/undervault_side_off.png | Bin 0 -> 524 bytes .../block/undervault/undervault_side_on.png | Bin 0 -> 507 bytes .../block/undervault/undervault_top.png | Bin 0 -> 555 bytes .../undervault/undervault_top_ejecting.png | Bin 0 -> 499 bytes ...reeping_horror.png => crawling_blight.png} | Bin ...ssive.png => crawling_blight_emissive.png} | Bin .../entity/{triffid.png => flytrap.png} | Bin ...lurking_terror.png => skulking_fright.png} | Bin ...ssive.png => skulking_fright_emissive.png} | Bin .../entity/{jumpy_bug.png => springbug.png} | Bin ...ug_emissive.png => springbug_emissive.png} | Bin .../stratoshark.png} | Bin .../stratoshark_emissive.png} | Bin ...horror_egg.png => crawling_blight_egg.png} | Bin .../item/{triffid_goo.png => flytrap_goo.png} | Bin ...terror_egg.png => skulking_fright_egg.png} | Bin ...ug_egg_item.png => springbug_egg_item.png} | Bin .../{jumpy_bug_leg.png => springbug_leg.png} | Bin .../{jumpy_boots.png => springy_boots.png} | Bin ...loud_shark_fin.png => stratoshark_fin.png} | Bin ..._fin_soup.png => stratoshark_fin_soup.png} | Bin .../antarchy/textures/item/undertrial_key.png | Bin 0 -> 465 bytes ..._layer_1.png => springy_boots_layer_1.png} | Bin .../particle/undertrial/undertrial_omen.png | Bin 0 -> 141 bytes .../undertrial_spawner_detection_0.png | Bin 0 -> 137 bytes .../undertrial_spawner_detection_1.png | Bin 0 -> 142 bytes .../undertrial_spawner_detection_2.png | Bin 0 -> 135 bytes .../undertrial_spawner_detection_3.png | Bin 0 -> 127 bytes .../undertrial_spawner_detection_4.png | Bin 0 -> 128 bytes .../undertrial/undervault_connection.png | Bin 0 -> 125 bytes .../advancement/anger_the_hive_mind.json | 2 +- .../data/antarchy/advancement/shark_weak.json | 8 +- .../data/antarchy/advancement/soups_up.json | 4 +- ...ffid_mauling.json => flytrap_mauling.json} | 2 +- ...ffid_swallow.json => flytrap_swallow.json} | 2 +- ...umpy_bug_jump.json => springbug_jump.json} | 2 +- .../antarchy/enchantment/chronosphere.json | 22 ++ .../antarchy/enchantment/feather_rising.json | 22 ++ ...rror_egg.json => crawling_blight_egg.json} | 2 +- ...or_eggs.json => crawling_blight_eggs.json} | 0 ..._goo_block.json => flytrap_goo_block.json} | 4 +- ...rror_egg.json => skulking_fright_egg.json} | 2 +- ...or_eggs.json => skulking_fright_eggs.json} | 0 ...{jumpy_bug_egg.json => springbug_egg.json} | 4 +- .../chests/underside_ruins/treasure.json | 2 +- ...rking_terror.json => crawling_blight.json} | 4 +- .../entities/{triffid.json => flytrap.json} | 4 +- ...eping_horror.json => skulking_fright.json} | 4 +- .../{jumpy_bug.json => springbug.json} | 4 +- .../{cloud_shark.json => stratoshark.json} | 2 +- .../spawners/underside_ruins/hard.json | 2 +- .../antarchy/recipe/big_bertha_blade.json | 2 +- .../data/antarchy/recipe/big_bertha_hilt.json | 4 +- ..._goo_block.json => flytrap_goo_block.json} | 4 +- .../recipe/miners_dream.json.disabled | 2 +- .../{jumpy_boots.json => springy_boots.json} | 4 +- ...in_soup.json => stratoshark_fin_soup.json} | 4 +- .../underside_ruins/underside_ruins1.nbt | Bin 0 -> 1170 bytes .../underside_ruins/underside_ruins2.nbt | Bin 0 -> 1405 bytes .../underside_ruins/underside_ruins3.nbt | Bin 0 -> 2047 bytes .../underside_ruins/underside_ruins4.nbt | Bin 0 -> 4001 bytes .../underside_ruins/underside_ruins5.nbt | Bin 0 -> 10026 bytes .../underside_ruins/underside_ruins6.nbt | Bin 0 -> 3577 bytes .../underside_ruins/underside_ruins7.nbt | Bin 0 -> 4622 bytes .../underside_ruins/underside_ruins8.nbt | Bin 0 -> 8148 bytes .../entity_type/dread_hallucination_mobs.json | 4 +- .../{triffid_prey.json => flytrap_prey.json} | 0 .../tags/entity_type/horde_common.json | 4 +- .../tags/entity_type/horde_jumpers.json | 2 +- .../tags/entity_type/inverted_immune.json | 2 +- .../entity_type/queen_does_not_attack.json | 6 +- .../tags/item/big_bertha_ingredient.json | 6 +- .../dread_hallucination_sounds.json | 4 +- .../has_structure/underside_ruins_biomes.json | 6 + .../worldgen/biome/brooding_tunnels.json | 2 +- .../antarchy/worldgen/biome/cloud_sea.json | 4 +- .../antarchy/worldgen/biome/dream_dunes.json | 5 +- .../worldgen/biome/ouranwood_forest.json | 2 +- .../worldgen/biome/vortex_expanse.json | 6 - .../configured_feature/flytrap_patch.json | 4 + .../jumpy_bug_egg_ceiling.json | 4 - .../configured_feature/queen_havoc_trail.json | 4 + .../springbug_egg_ceiling.json | 4 + .../thoraxis_transition_throat.json | 4 + .../configured_feature/triffid_patch.json | 4 - ...{triffid_patch.json => flytrap_patch.json} | 2 +- .../placed_feature/queen_havoc_trail.json | 4 + ...eiling.json => springbug_egg_ceiling.json} | 2 +- .../thoraxis_transition_throat.json | 24 ++ .../worldgen/structure/underside_ruins.json | 27 ++ .../worldgen/structure_set/underside.json | 14 ++ .../underside_ruins/underside_ruins.json | 78 ++++++ .../resources/data/c/tags/item/boots.json | 2 +- .../data/c/tags/item/enchantables.json | 2 +- .../data/c/tags/item/foods/soup.json | 2 +- .../data/c/tags/item/slime_balls.json | 2 +- .../resources/data/c/tags/item/stones.json | 2 +- .../minecraft/tags/enchantment/treasure.json | 6 + .../minecraft/tags/entity_type/arthropod.json | 6 +- .../tags/item/enchantable/durability.json | 2 +- .../tags/item/enchantable/equippable.json | 2 +- .../tags/item/enchantable/vanishing.json | 2 +- .../data/minecraft/tags/item/foot_armor.json | 2 +- .../data/minecraft/tags/item/slime_balls.json | 2 +- .../minecraft/tags/item/trimmable_armor.json | 2 +- .../fabric/AntarchyFabricContent.java | 58 ++--- .../antarchy/fabric/AntarchyFabricEvents.java | 9 + .../client/AntarchyFabricClientBootstrap.java | 35 ++- ...nderer.java => FlytrapGooHudRenderer.java} | 6 +- ...er.java => SpringyBootsClientHandler.java} | 22 +- ...erer.java => SpringyBootsHudRenderer.java} | 16 +- ....java => SpringyBootsFallDamageMixin.java} | 19 +- .../network/AntarchyFabricNetworking.java | 34 +-- .../fabric/registry/AntarchyFabricBlocks.java | 50 +++- .../registry/AntarchyFabricEntities.java | 36 +-- .../AntarchyFabricEntityAttributes.java | 16 +- .../fabric/registry/AntarchyFabricItems.java | 49 ++-- .../fabric/registry/AntarchyFabricMisc.java | 31 ++- .../fabric/registry/AntarchyFabricSounds.java | 42 ++-- .../AntarchyFabricSpawnPlacements.java | 12 +- ...per.java => SpringyBootsFabricHelper.java} | 2 +- .../resources/antarchy-fabric.mixins.json | 2 +- .../AntarchyConfigModuleNeoforge.java | 22 +- .../antarchy/neoforge/AntarchyMobsConfig.java | 86 +++---- .../antarchy/neoforge/AntarchyNeoforge.java | 54 ++-- .../neoforge/AntarchyNeoforgeEvents.java | 2 + .../client/AntarchyNeoForgeClient.java | 31 ++- ...nderer.java => FlytrapGooHudRenderer.java} | 6 +- ...er.java => SpringyBootsClientHandler.java} | 24 +- ...erer.java => SpringyBootsHudRenderer.java} | 16 +- ...rking.java => SpringyBootsNetworking.java} | 38 +-- .../registry/AntarchyNeoForgeEvents.java | 10 +- .../registry/AntarchyNeoforgeBlocks.java | 49 +++- .../registry/AntarchyNeoforgeEntites.java | 40 +-- .../AntarchyNeoforgeEntityAttributes.java | 16 +- .../registry/AntarchyNeoforgeItems.java | 57 +++-- .../registry/AntarchyNeoforgeMisc.java | 18 +- .../AntarchyNeoforgePayloadHandlers.java | 4 +- .../registry/AntarchyNeoforgeSounds.java | 42 ++-- .../AntarchyNeoforgeSpawnPlacements.java | 10 +- 379 files changed, 4267 insertions(+), 2002 deletions(-) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/{CreepingHorrorEggBlock.java => CrawlingBlightEggBlock.java} (93%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/{TriffidGooBlock.java => FlytrapGooBlock.java} (96%) create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/QueenTrailSpawnMarkerBlock.java rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/{LurkingTerrorEggBlock.java => SkulkingFrightEggBlock.java} (92%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/{JumpyBugEggBlock.java => SpringbugEggBlock.java} (90%) create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UnderVaultBlock.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UndertrialSpawnerBlock.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/QueenTrailSpawnMarkerBlockEntity.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UnderVaultBlockEntity.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UndertrialSpawnerBlockEntity.java rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/{CreepingHorrorModel.java => CrawlingBlightModel.java} (53%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/{TriffidModel.java => FlytrapModel.java} (52%) delete mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/LurkingTerrorModel.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/SkulkingFrightModel.java rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/{JumpyBugModel.java => SpringbugModel.java} (52%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/{CloudSharkModel.java => StratosharkModel.java} (53%) create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/particle/UndertrialParticle.java rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/{CreepingHorrorRenderer.java => CrawlingBlightRenderer.java} (72%) create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/FlytrapRenderer.java delete mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/LurkingTerrorRenderer.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/SkulkingFrightRenderer.java rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/{JumpyBugRenderer.java => SpringbugRenderer.java} (64%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/{CloudSharkRenderer.java => StratosharkRenderer.java} (61%) delete mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/TriffidRenderer.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UnderVaultRenderer.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UndertrialSpawnerRenderer.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/command/QueenLocateCommand.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/enchantment/AntarchyEnchantments.java rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/{CreepingHorrorEntity.java => CrawlingBlightEntity.java} (92%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/{TriffidEntity.java => FlytrapEntity.java} (92%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/{LurkingTerrorEntity.java => SkulkingFrightEntity.java} (89%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/{JumpyBugEntity.java => SpringbugEntity.java} (80%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/{cloud_shark => stratoshark}/SharknadoManager.java (92%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/{cloud_shark/CloudSharkEntity.java => stratoshark/StratosharkEntity.java} (95%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/{TriffidGooBlockItem.java => FlytrapGooBlockItem.java} (79%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/{JumpyBootsHelper.java => SpringyBootsHelper.java} (85%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/{JumpyBootsItem.java => SpringyBootsItem.java} (71%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/{CloudSharkFinSoupItem.java => StratosharkFinSoupItem.java} (79%) delete mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/JumpyBootsLaunchPayload.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/SpringyBootsLaunchPayload.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/ChronosphereManager.java rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/cavaryn/{JumpyBugEggCeilingFeature.java => SpringbugEggCeilingFeature.java} (84%) rename common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/{TriffidPatchFeature.java => FlytrapPatchFeature.java} (91%) create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenHavocTrailFeature.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenTrailGrid.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisTransitionThroatFeature.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityChronosphereEquipmentMixin.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityFoodUseTimeDilationMixin.java create mode 100644 common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/PlayerCooldownTimeDilationMixin.java rename common-1.21.1/src/main/resources/assets/antarchy/animations/{creeping_horror.animation.json => crawling_blight.animation.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/animations/{triffid.animation.json => flytrap.animation.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/animations/{lurking_terror.animation.json => skulking_fright.animation.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/animations/{jumpy_bug.animation.json => springbug.animation.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/animations/{cloud_shark.animation.json => stratoshark.animation.json} (100%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/crawling_blight_egg.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/creeping_horror_egg.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/flytrap_goo_block.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/lurking_terror_egg.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/skulking_fright_egg.json rename common-1.21.1/src/main/resources/assets/antarchy/blockstates/{jumpy_bug_egg.json => springbug_egg.json} (57%) delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/triffid_goo_block.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/undertrial_spawner.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/blockstates/undervault.json rename common-1.21.1/src/main/resources/assets/antarchy/geo/{creeping_horror.geo.json => crawling_blight.geo.json} (99%) rename common-1.21.1/src/main/resources/assets/antarchy/geo/{triffid.geo.json => flytrap.geo.json} (99%) rename common-1.21.1/src/main/resources/assets/antarchy/geo/{lurking_terror.geo.json => skulking_fright.geo.json} (99%) rename common-1.21.1/src/main/resources/assets/antarchy/geo/{jumpy_bug.geo.json => springbug.geo.json} (99%) rename common-1.21.1/src/main/resources/assets/antarchy/geo/{cloud_shark.geo.json => stratoshark.geo.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{creeping_horror_egg_1.json => crawling_blight_egg_1.json} (55%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{creeping_horror_egg_2.json => crawling_blight_egg_2.json} (56%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{creeping_horror_egg_3.json => crawling_blight_egg_3.json} (57%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_4.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_4.json rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{triffid_goo_block.json => flytrap_goo_block.json} (91%) delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_4.json rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{lurking_terror_egg_1.json => skulking_fright_egg_1.json} (52%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{lurking_terror_egg_2.json => skulking_fright_egg_2.json} (54%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{lurking_terror_egg_3.json => skulking_fright_egg_3.json} (54%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_4.json rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{slightly_cracked_creeping_horror_egg_1.json => slightly_cracked_crawling_blight_egg_1.json} (60%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{slightly_cracked_creeping_horror_egg_2.json => slightly_cracked_crawling_blight_egg_2.json} (61%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{slightly_cracked_creeping_horror_egg_3.json => slightly_cracked_crawling_blight_egg_3.json} (61%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_4.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_4.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_1.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_2.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_3.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_4.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_1.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_2.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_3.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_4.json rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{jumpy_bug_egg.json => springbug_egg.json} (94%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_active.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_ejecting_reward.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_inactive.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_ejecting.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_inner_faces.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_off.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_on.json rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{very_cracked_creeping_horror_egg_1.json => very_cracked_crawling_blight_egg_1.json} (58%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{very_cracked_creeping_horror_egg_2.json => very_cracked_crawling_blight_egg_2.json} (60%) rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{very_cracked_creeping_horror_egg_3.json => very_cracked_crawling_blight_egg_3.json} (60%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_4.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_4.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_1.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_2.json delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_4.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_1.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_2.json rename common-1.21.1/src/main/resources/assets/antarchy/models/block/{very_cracked_lurking_terror_egg_3.json => very_cracked_skulking_fright_egg_3.json} (50%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_4.json rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{creeping_horror_egg.json => crawling_blight_egg.json} (56%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{cloud_shark_spawn_egg.json => crawling_blight_spawn_egg.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{jumpy_boots.json => flytrap_goo.json} (60%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_goo_block.json rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{creeping_horror_spawn_egg.json => flytrap_spawn_egg.json} (100%) delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/item/lurking_terror_egg.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/item/skulking_fright_egg.json rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{jumpy_bug_spawn_egg.json => skulking_fright_spawn_egg.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{jumpy_bug_egg.json => springbug_egg.json} (56%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{jumpy_bug_leg.json => springbug_leg.json} (59%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{lurking_terror_spawn_egg.json => springbug_spawn_egg.json} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{triffid_goo.json => springy_boots.json} (59%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{cloud_shark_fin.json => stratoshark_fin.json} (58%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{cloud_shark_fin_soup.json => stratoshark_fin_soup.json} (55%) rename common-1.21.1/src/main/resources/assets/antarchy/models/item/{triffid_spawn_egg.json => stratoshark_spawn_egg.json} (100%) delete mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_goo_block.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_key.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_spawner.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/models/item/undervault.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_omen.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_spawner_detection.json create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/particles/undervault_connection.json rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_bite1.ogg => crawling_blight/crawling_blight_bite1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_bite2.ogg => crawling_blight/crawling_blight_bite2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_bite3.ogg => crawling_blight/crawling_blight_bite3.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_bite4.ogg => crawling_blight/crawling_blight_bite4.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_growl1.ogg => crawling_blight/crawling_blight_growl1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_growl2.ogg => crawling_blight/crawling_blight_growl2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_hurt1.ogg => crawling_blight/crawling_blight_hurt1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{creeping_horror/creeping_horror_hurt2.ogg => crawling_blight/crawling_blight_hurt2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_attack1.ogg => flytrap/flytrap_attack1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_grab1.ogg => flytrap/flytrap_grab1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_growl1.ogg => flytrap/flytrap_growl1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_growl2.ogg => flytrap/flytrap_growl2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_hiss1.ogg => flytrap/flytrap_hiss1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_hurt1.ogg => flytrap/flytrap_hurt1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_hurt2.ogg => flytrap/flytrap_hurt2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{triffid/triffid_hurt3.ogg => flytrap/flytrap_hurt3.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{lurking_terror/lurking_terror_bite1.ogg => skulking_fright/skulking_fright_bite1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{lurking_terror/lurking_terror_fly_loop.ogg => skulking_fright/skulking_fright_fly_loop.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug/hurt1.ogg => skulking_fright/skulking_fright_hurt1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug/hurt2.ogg => skulking_fright/skulking_fright_hurt2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{lurking_terror/lurking_terror_snarl1.ogg => skulking_fright/skulking_fright_snarl1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{lurking_terror/lurking_terror_snarl2.ogg => skulking_fright/skulking_fright_snarl2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{lurking_terror/lurking_terror_hurt1.ogg => springbug/hurt1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{lurking_terror/lurking_terror_hurt2.ogg => springbug/hurt2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug => springbug}/idle1.ogg (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug => springbug}/idle2.ogg (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug => springbug}/idle3.ogg (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug => springbug}/idle4.ogg (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug => springbug}/jump1.ogg (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug => springbug}/jump2.ogg (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{jumpy_bug => springbug}/jump3.ogg (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_bite.ogg => stratoshark/stratoshark_bite.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_death.ogg => stratoshark/stratoshark_death.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_fly1.ogg => stratoshark/stratoshark_fly1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_hurt.ogg => stratoshark/stratoshark_hurt.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_idle1.ogg => stratoshark/stratoshark_idle1.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_idle2.ogg => stratoshark/stratoshark_idle2.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_idle3.ogg => stratoshark/stratoshark_idle3.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/{cloud_shark/cloud_shark_idle4.ogg => stratoshark/stratoshark_idle4.ogg} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{creeping_horror_egg/creeping_horror_egg.png => crawling_blight_egg/crawling_blight_egg.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{creeping_horror_egg/creeping_horror_egg_slightly_cracked.png => crawling_blight_egg/crawling_blight_egg_slightly_cracked.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{creeping_horror_egg/creeping_horror_egg_very_cracked.png => crawling_blight_egg/crawling_blight_egg_very_cracked.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{triffid_goo_block.png => flytrap_goo_block.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{lurking_terror_egg/lurking_terror_egg.png => skulking_fright_egg/skulking_fright_egg.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{lurking_terror_egg/lurking_terror_egg_slightly_cracked.png => skulking_fright_egg/skulking_fright_egg_slightly_cracked.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{lurking_terror_egg/lurking_terror_egg_very_cracked.png => skulking_fright_egg/skulking_fright_egg_very_cracked.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{jumpy_bug_egg.png => springbug_egg.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/block/{jumpy_bug_egg.png.mcmeta => springbug_egg.png.mcmeta} (100%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_bottom.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_side_active.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_side_inactive.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_top_active.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_top_ejecting_reward.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_top_inactive.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_bottom.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_front_ejecting.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_front_off.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_front_on.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_side_off.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_side_on.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_top.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_top_ejecting.png rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{creeping_horror.png => crawling_blight.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{creeping_horror_emissive.png => crawling_blight_emissive.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{triffid.png => flytrap.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{lurking_terror.png => skulking_fright.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{lurking_terror_emissive.png => skulking_fright_emissive.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{jumpy_bug.png => springbug.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{jumpy_bug_emissive.png => springbug_emissive.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{cloud_shark/cloud_shark.png => stratoshark/stratoshark.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/entity/{cloud_shark/cloud_shark_emissive.png => stratoshark/stratoshark_emissive.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{creeping_horror_egg.png => crawling_blight_egg.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{triffid_goo.png => flytrap_goo.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{lurking_terror_egg.png => skulking_fright_egg.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{jumpy_bug_egg_item.png => springbug_egg_item.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{jumpy_bug_leg.png => springbug_leg.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{jumpy_boots.png => springy_boots.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{cloud_shark_fin.png => stratoshark_fin.png} (100%) rename common-1.21.1/src/main/resources/assets/antarchy/textures/item/{cloud_shark_fin_soup.png => stratoshark_fin_soup.png} (100%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/item/undertrial_key.png rename common-1.21.1/src/main/resources/assets/antarchy/textures/models/armor/{jumpy_boots_layer_1.png => springy_boots_layer_1.png} (100%) create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_omen.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_0.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_1.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_2.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_3.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_4.png create mode 100644 common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undervault_connection.png rename common-1.21.1/src/main/resources/data/antarchy/damage_type/{triffid_mauling.json => flytrap_mauling.json} (78%) rename common-1.21.1/src/main/resources/data/antarchy/damage_type/{triffid_swallow.json => flytrap_swallow.json} (78%) rename common-1.21.1/src/main/resources/data/antarchy/damage_type/{jumpy_bug_jump.json => springbug_jump.json} (79%) create mode 100644 common-1.21.1/src/main/resources/data/antarchy/enchantment/chronosphere.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/enchantment/feather_rising.json rename common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/{lurking_terror_egg.json => crawling_blight_egg.json} (87%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/{creeping_horror_eggs.json => crawling_blight_eggs.json} (100%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/{triffid_goo_block.json => flytrap_goo_block.json} (72%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/{creeping_horror_egg.json => skulking_fright_egg.json} (87%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/{lurking_terror_eggs.json => skulking_fright_eggs.json} (100%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/{jumpy_bug_egg.json => springbug_egg.json} (73%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/{lurking_terror.json => crawling_blight.json} (96%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/{triffid.json => flytrap.json} (89%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/{creeping_horror.json => skulking_fright.json} (96%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/{jumpy_bug.json => springbug.json} (97%) rename common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/{cloud_shark.json => stratoshark.json} (85%) rename common-1.21.1/src/main/resources/data/antarchy/recipe/{triffid_goo_block.json => flytrap_goo_block.json} (69%) rename common-1.21.1/src/main/resources/data/antarchy/recipe/{jumpy_boots.json => springy_boots.json} (75%) rename common-1.21.1/src/main/resources/data/antarchy/recipe/{cloud_shark_fin_soup.json => stratoshark_fin_soup.json} (68%) create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins1.nbt create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins2.nbt create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins3.nbt create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins4.nbt create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins5.nbt create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins6.nbt create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins7.nbt create mode 100644 common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins8.nbt rename common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/{triffid_prey.json => flytrap_prey.json} (100%) create mode 100644 common-1.21.1/src/main/resources/data/antarchy/tags/worldgen/biome/has_structure/underside_ruins_biomes.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/flytrap_patch.json delete mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/jumpy_bug_egg_ceiling.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/queen_havoc_trail.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/springbug_egg_ceiling.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/thoraxis_transition_throat.json delete mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/triffid_patch.json rename common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/{triffid_patch.json => flytrap_patch.json} (87%) create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/queen_havoc_trail.json rename common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/{jumpy_bug_egg_ceiling.json => springbug_egg_ceiling.json} (91%) create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/thoraxis_transition_throat.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/structure/underside_ruins.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/structure_set/underside.json create mode 100644 common-1.21.1/src/main/resources/data/antarchy/worldgen/template_pool/underside_ruins/underside_ruins.json create mode 100644 common-1.21.1/src/main/resources/data/minecraft/tags/enchantment/treasure.json rename fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/{TriffidGooHudRenderer.java => FlytrapGooHudRenderer.java} (92%) rename fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/{JumpyBootsClientHandler.java => SpringyBootsClientHandler.java} (71%) rename fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/{JumpyBootsHudRenderer.java => SpringyBootsHudRenderer.java} (76%) rename fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/{JumpyBootsFallDamageMixin.java => SpringyBootsFallDamageMixin.java} (65%) rename fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/util/{JumpyBootsFabricHelper.java => SpringyBootsFabricHelper.java} (93%) rename neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/{TriffidGooHudRenderer.java => FlytrapGooHudRenderer.java} (91%) rename neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/{JumpyBootsClientHandler.java => SpringyBootsClientHandler.java} (75%) rename neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/{JumpyBootsHudRenderer.java => SpringyBootsHudRenderer.java} (76%) rename neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/network/{JumpyBootsNetworking.java => SpringyBootsNetworking.java} (65%) 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 e829813f..02c978f5 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 @@ -385,19 +385,19 @@ public final class AntarchySettings { private static double bedBugAttackDamage = 4.0D; private static double bedBugMovementSpeed = 0.24D; private static double bedBugArmor = 2.0D; - private static double jumpyBugHealth = 100.0D; - private static double jumpyBugPounceDamage = 12.0D; - private static double jumpyBugCamouflageAlpha = 0.18D; + private static double springbugHealth = 100.0D; + private static double springbugPounceDamage = 12.0D; + private static double springbugCamouflageAlpha = 0.18D; private static double brutalflyArmor = 10.0D; private static double brutalflyArmorToughness = 5.0D; private static double brutalflyKnockbackResistance = 0.7D; private static double brutalflyMovementSpeed = 0.34D; private static double brutalflyFlyingSpeed = 0.55D; - private static double cloudSharkHealth = 40.0D; - private static double cloudSharkAttackDamage = 5.0D; - private static double cloudSharkMovementSpeed = 0.34D; - private static double cloudSharkFlyingSpeed = 0.5D; - private static double cloudSharkKnockbackResistance = 0.2D; + private static double stratosharkHealth = 40.0D; + private static double stratosharkAttackDamage = 5.0D; + private static double stratosharkMovementSpeed = 0.34D; + private static double stratosharkFlyingSpeed = 0.5D; + private static double stratosharkKnockbackResistance = 0.2D; private static double krakenMovementSpeed = 0.24D; private static double krakenFlyingSpeed = 0.24D; private static double krakenKnockbackResistance = 0.8D; @@ -452,10 +452,10 @@ public final class AntarchySettings { private static double molewormHealth = 8.0D; private static double molewormAttackDamage = 1.0D; private static double molewormMovementSpeed = 0.25D; - private static double triffidHealth = 160.0D; - private static double triffidAttackDamage = 10.0D; - private static double triffidGrabDamage = 15.0D; - private static int triffidSweepHitCooldownTicks = 10; + private static double flytrapHealth = 160.0D; + private static double flytrapAttackDamage = 10.0D; + private static double flytrapGrabDamage = 15.0D; + private static int flytrapSweepHitCooldownTicks = 10; private static double molevoreHealth = 140.0D; private static double molevoreAttackDamage = 10.0D; private static double molevoreMovementSpeed = 0.27D; @@ -538,10 +538,10 @@ public final class AntarchySettings { private static int waterBombLifetimeTicks = 120; private static double waterBombGravity = 0.12D; private static double waterBombKnockback = 1.2D; - private static double creepingHorrorHealth = 15.0D; - private static double creepingHorrorAttackDamage = 6.0D; - private static double lurkingTerrorHealth = 15.0D; - private static double lurkingTerrorAttackDamage = 6.0D; + private static double crawlingBlightHealth = 15.0D; + private static double crawlingBlightAttackDamage = 6.0D; + private static double skulkingFrightHealth = 15.0D; + private static double skulkingFrightAttackDamage = 6.0D; private static double manticoreHealth = 40.0D; private static double manticoreAttackDamage = 7.0D; private static int manticoreStingPoisonTicks = 100; @@ -597,7 +597,7 @@ public final class AntarchySettings { private static double glimmerHealth = 20.0D; private static double lucidArmorToughness = 2.0D; - private static double triffidArmorToughness = 3.0D; + private static double flytrapArmorToughness = 3.0D; private static double basiliskArmorToughness = 5.0D; private static double nightmareMobArmorToughness = 5.0D; private static double alphaMantisArmorToughness = 4.0D; @@ -2505,14 +2505,14 @@ public final class AntarchySettings { public static double bedBugArmor() { return bedBugArmor; } public static void setBedBugArmor(double value) { bedBugArmor = value; } - public static double jumpyBugHealth() { return jumpyBugHealth; } - public static void setJumpyBugHealth(double value) { jumpyBugHealth = value; } + public static double springbugHealth() { return springbugHealth; } + public static void setSpringbugHealth(double value) { springbugHealth = value; } - public static double jumpyBugPounceDamage() { return jumpyBugPounceDamage; } - public static void setJumpyBugPounceDamage(double value) { jumpyBugPounceDamage = value; } + public static double springbugPounceDamage() { return springbugPounceDamage; } + public static void setSpringbugPounceDamage(double value) { springbugPounceDamage = value; } - public static double jumpyBugCamouflageAlpha() { return jumpyBugCamouflageAlpha; } - public static void setJumpyBugCamouflageAlpha(double value) { jumpyBugCamouflageAlpha = value; } + public static double springbugCamouflageAlpha() { return springbugCamouflageAlpha; } + public static void setSpringbugCamouflageAlpha(double value) { springbugCamouflageAlpha = value; } public static double brutalflyArmor() { return brutalflyArmor; } public static void setBrutalflyArmor(double value) { brutalflyArmor = value; } @@ -2529,20 +2529,20 @@ public final class AntarchySettings { public static double brutalflyFlyingSpeed() { return brutalflyFlyingSpeed; } public static void setBrutalflyFlyingSpeed(double value) { brutalflyFlyingSpeed = value; } - public static double cloudSharkHealth() { return cloudSharkHealth; } - public static void setCloudSharkHealth(double value) { cloudSharkHealth = value; } + public static double stratosharkHealth() { return stratosharkHealth; } + public static void setStratosharkHealth(double value) { stratosharkHealth = value; } - public static double cloudSharkAttackDamage() { return cloudSharkAttackDamage; } - public static void setCloudSharkAttackDamage(double value) { cloudSharkAttackDamage = value; } + public static double stratosharkAttackDamage() { return stratosharkAttackDamage; } + public static void setStratosharkAttackDamage(double value) { stratosharkAttackDamage = value; } - public static double cloudSharkMovementSpeed() { return cloudSharkMovementSpeed; } - public static void setCloudSharkMovementSpeed(double value) { cloudSharkMovementSpeed = value; } + public static double stratosharkMovementSpeed() { return stratosharkMovementSpeed; } + public static void setStratosharkMovementSpeed(double value) { stratosharkMovementSpeed = value; } - public static double cloudSharkFlyingSpeed() { return cloudSharkFlyingSpeed; } - public static void setCloudSharkFlyingSpeed(double value) { cloudSharkFlyingSpeed = value; } + public static double stratosharkFlyingSpeed() { return stratosharkFlyingSpeed; } + public static void setStratosharkFlyingSpeed(double value) { stratosharkFlyingSpeed = value; } - public static double cloudSharkKnockbackResistance() { return cloudSharkKnockbackResistance; } - public static void setCloudSharkKnockbackResistance(double value) { cloudSharkKnockbackResistance = value; } + public static double stratosharkKnockbackResistance() { return stratosharkKnockbackResistance; } + public static void setStratosharkKnockbackResistance(double value) { stratosharkKnockbackResistance = value; } public static double krakenMovementSpeed() { return krakenMovementSpeed; } public static void setKrakenMovementSpeed(double value) { krakenMovementSpeed = value; } @@ -2706,17 +2706,17 @@ public final class AntarchySettings { public static double molewormMovementSpeed() { return molewormMovementSpeed; } public static void setMolewormMovementSpeed(double value) { molewormMovementSpeed = value; } - public static double triffidHealth() { return triffidHealth; } - public static void setTriffidHealth(double value) { triffidHealth = value; } + public static double flytrapHealth() { return flytrapHealth; } + public static void setFlytrapHealth(double value) { flytrapHealth = value; } - public static double triffidAttackDamage() { return triffidAttackDamage; } - public static void setTriffidAttackDamage(double value) { triffidAttackDamage = value; } + public static double flytrapAttackDamage() { return flytrapAttackDamage; } + public static void setFlytrapAttackDamage(double value) { flytrapAttackDamage = value; } - public static double triffidGrabDamage() { return triffidGrabDamage; } - public static void setTriffidGrabDamage(double value) { triffidGrabDamage = value; } + public static double flytrapGrabDamage() { return flytrapGrabDamage; } + public static void setFlytrapGrabDamage(double value) { flytrapGrabDamage = value; } - public static int triffidSweepHitCooldownTicks() { return triffidSweepHitCooldownTicks; } - public static void setTriffidSweepHitCooldownTicks(int value) { triffidSweepHitCooldownTicks = value; } + public static int flytrapSweepHitCooldownTicks() { return flytrapSweepHitCooldownTicks; } + public static void setFlytrapSweepHitCooldownTicks(int value) { flytrapSweepHitCooldownTicks = value; } public static double molevoreHealth() { return molevoreHealth; } public static void setMolevoreHealth(double value) { molevoreHealth = value; } @@ -2875,14 +2875,14 @@ public final class AntarchySettings { public static double waterBombKnockback() { return waterBombKnockback; } public static void setWaterBombKnockback(double v) { waterBombKnockback = v; } - public static double creepingHorrorHealth() { return creepingHorrorHealth; } - public static void setCreepingHorrorHealth(double v) { creepingHorrorHealth = v; } - public static double creepingHorrorAttackDamage() { return creepingHorrorAttackDamage; } - public static void setCreepingHorrorAttackDamage(double v) { creepingHorrorAttackDamage = v; } - public static double lurkingTerrorHealth() { return lurkingTerrorHealth; } - public static void setLurkingTerrorHealth(double v) { lurkingTerrorHealth = v; } - public static double lurkingTerrorAttackDamage() { return lurkingTerrorAttackDamage; } - public static void setLurkingTerrorAttackDamage(double v) { lurkingTerrorAttackDamage = v; } + public static double crawlingBlightHealth() { return crawlingBlightHealth; } + public static void setCrawlingBlightHealth(double v) { crawlingBlightHealth = v; } + public static double crawlingBlightAttackDamage() { return crawlingBlightAttackDamage; } + public static void setCrawlingBlightAttackDamage(double v) { crawlingBlightAttackDamage = v; } + public static double skulkingFrightHealth() { return skulkingFrightHealth; } + public static void setSkulkingFrightHealth(double v) { skulkingFrightHealth = v; } + public static double skulkingFrightAttackDamage() { return skulkingFrightAttackDamage; } + public static void setSkulkingFrightAttackDamage(double v) { skulkingFrightAttackDamage = v; } public static double manticoreHealth() { return manticoreHealth; } public static void setManticoreHealth(double v) { manticoreHealth = v; } public static double manticoreAttackDamage() { return manticoreAttackDamage; } @@ -2991,7 +2991,7 @@ public final class AntarchySettings { public static void setGlimmerHealth(double v) { glimmerHealth = v; } public static double lucidArmorToughness() { return lucidArmorToughness; } - public static double triffidArmorToughness() { return triffidArmorToughness; } + public static double flytrapArmorToughness() { return flytrapArmorToughness; } public static double basiliskArmorToughness() { return basiliskArmorToughness; } public static double nightmareMobArmorToughness() { return nightmareMobArmorToughness; } public static double alphaMantisArmorToughness() { return alphaMantisArmorToughness; } 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 4e87790d..0421ada6 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 @@ -9,9 +9,9 @@ import com.craisinlord.antarchy.content.entity.HerculesBeetleEntity; import com.craisinlord.antarchy.content.entity.HushProjectileEntity; import com.craisinlord.antarchy.content.entity.StinkBugEntity; import com.craisinlord.antarchy.content.entity.WaterBombEntity; -import com.craisinlord.antarchy.content.entity.TriffidEntity; -import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity; -import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity; +import com.craisinlord.antarchy.content.entity.FlytrapEntity; +import com.craisinlord.antarchy.content.entity.CrawlingBlightEntity; +import com.craisinlord.antarchy.content.entity.SkulkingFrightEntity; import com.craisinlord.antarchy.content.entity.ToreterrorEntity; import com.craisinlord.antarchy.content.entity.WaspEntity; import com.craisinlord.antarchy.content.entity.brutalfly.BrutalflyEntity; @@ -125,7 +125,7 @@ public final class AntarchyObjects { @SuppressWarnings("unchecked") public static Supplier> REVERIE = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") - public static Supplier> TRIFFID = (Supplier>) UNBOUND; + public static Supplier> FLYTRAP = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") public static Supplier> BRUTALFLY = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") @@ -137,9 +137,9 @@ public final class AntarchyObjects { @SuppressWarnings("unchecked") public static Supplier> WATER_BOMB = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") - public static Supplier> CREEPING_HORROR = (Supplier>) UNBOUND; + public static Supplier> CRAWLING_BLIGHT = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") - public static Supplier> LURKING_TERROR = (Supplier>) UNBOUND; + public static Supplier> SKULKING_FRIGHT = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") public static Supplier> MANTICORE = (Supplier>) UNBOUND; @SuppressWarnings("unchecked") @@ -262,7 +262,7 @@ public final class AntarchyObjects { @SuppressWarnings("unchecked") public static Supplier CLOUD_BLOCK = (Supplier) UNBOUND; @SuppressWarnings("unchecked") - public static Supplier TRIFFID_GOO_BLOCK = (Supplier) UNBOUND; + public static Supplier FLYTRAP_GOO_BLOCK = (Supplier) UNBOUND; @SuppressWarnings("unchecked") public static Supplier PALE_NYXITE = (Supplier) UNBOUND; @SuppressWarnings("unchecked") @@ -344,9 +344,9 @@ public final class AntarchyObjects { @SuppressWarnings("unchecked") public static Supplier BED_BUG_EGG = (Supplier) UNBOUND; @SuppressWarnings("unchecked") - public static Supplier CREEPING_HORROR_EGGS = (Supplier) UNBOUND; + public static Supplier CRAWLING_BLIGHT_EGGS = (Supplier) UNBOUND; @SuppressWarnings("unchecked") - public static Supplier LURKING_TERROR_EGGS = (Supplier) UNBOUND; + public static Supplier SKULKING_FRIGHT_EGGS = (Supplier) UNBOUND; @SuppressWarnings("unchecked") public static Supplier WASP_NEST = (Supplier) UNBOUND; @SuppressWarnings("unchecked") @@ -441,14 +441,14 @@ public final class AntarchyObjects { Supplier> caterpillar, Supplier> butterfly, Supplier> reverie, - Supplier> triffid, + Supplier> flytrap, Supplier> brutalfly, Supplier> brutalflyOrb, Supplier> hushProjectile, Supplier> toreterror, Supplier> waterBomb, - Supplier> creepingHorror, - Supplier> lurkingTerror, + Supplier> crawlingBlight, + Supplier> skulkingFright, Supplier> stinkBug, Supplier> cheep, Supplier> dorrie, @@ -477,7 +477,7 @@ public final class AntarchyObjects { Supplier shellstoneBrickSlab, Supplier shellstoneBrickWall, Supplier cloudBlock, - Supplier triffidGooBlock, + Supplier flytrapGooBlock, Supplier paleNyxite, Supplier nyxiteSpike, Supplier chitinBlock, @@ -509,8 +509,8 @@ public final class AntarchyObjects { Supplier orangeMilkweed, Supplier pinkMilkweed, Supplier bedBugEggs, - Supplier creepingHorrorEggs, - Supplier lurkingTerrorEggs, + Supplier crawlingBlightEggs, + Supplier skulkingFrightEggs, Supplier waspNest, Supplier hushweed, Supplier squirrelNestBlock, @@ -542,14 +542,14 @@ public final class AntarchyObjects { CATERPILLAR = caterpillar; BUTTERFLY = butterfly; REVERIE = reverie; - TRIFFID = triffid; + FLYTRAP = flytrap; BRUTALFLY = brutalfly; BRUTALFLY_ORB = brutalflyOrb; HUSH_PROJECTILE = hushProjectile; TORETERROR = toreterror; WATER_BOMB = waterBomb; - CREEPING_HORROR = creepingHorror; - LURKING_TERROR = lurkingTerror; + CRAWLING_BLIGHT = crawlingBlight; + SKULKING_FRIGHT = skulkingFright; STINK_BUG = stinkBug; CHEEP = cheep; DORRIE = dorrie; @@ -578,7 +578,7 @@ public final class AntarchyObjects { SHELLSTONE_BRICK_SLAB = shellstoneBrickSlab; SHELLSTONE_BRICK_WALL = shellstoneBrickWall; CLOUD_BLOCK = cloudBlock; - TRIFFID_GOO_BLOCK = triffidGooBlock; + FLYTRAP_GOO_BLOCK = flytrapGooBlock; PALE_NYXITE = paleNyxite; NYXITE_SPIKE = nyxiteSpike; CHITIN_BLOCK = chitinBlock; @@ -610,8 +610,8 @@ public final class AntarchyObjects { ORANGE_MILKWEED = orangeMilkweed; PINK_MILKWEED = pinkMilkweed; BED_BUG_EGG = bedBugEggs; - CREEPING_HORROR_EGGS = creepingHorrorEggs; - LURKING_TERROR_EGGS = lurkingTerrorEggs; + CRAWLING_BLIGHT_EGGS = crawlingBlightEggs; + SKULKING_FRIGHT_EGGS = skulkingFrightEggs; WASP_NEST = waspNest; HUSHWEED = hushweed; SQUIRREL_NEST_BLOCK = squirrelNestBlock; diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java index 79d49a64..fcce21e8 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java @@ -23,11 +23,11 @@ public final class AntarchySoundEvents { public static Supplier ANT_BITE = (Supplier) UNBOUND; public static Supplier ANT_GATHER = (Supplier) UNBOUND; public static Supplier ANT_NEST = (Supplier) UNBOUND; - public static Supplier CLOUD_SHARK_BITE = (Supplier) UNBOUND; - public static Supplier CLOUD_SHARK_IDLE = (Supplier) UNBOUND; - public static Supplier CLOUD_SHARK_HURT = (Supplier) UNBOUND; - public static Supplier CLOUD_SHARK_DEATH = (Supplier) UNBOUND; - public static Supplier CLOUD_SHARK_FLY = (Supplier) UNBOUND; + public static Supplier STRATOSHARK_BITE = (Supplier) UNBOUND; + public static Supplier STRATOSHARK_IDLE = (Supplier) UNBOUND; + public static Supplier STRATOSHARK_HURT = (Supplier) UNBOUND; + public static Supplier STRATOSHARK_DEATH = (Supplier) UNBOUND; + public static Supplier STRATOSHARK_FLY = (Supplier) UNBOUND; public static Supplier CATERPILLAR_IDLE = (Supplier) UNBOUND; public static Supplier CATERPILLAR_HURT = (Supplier) UNBOUND; public static Supplier CATERPILLAR_CRAWL = (Supplier) UNBOUND; @@ -91,12 +91,12 @@ public final class AntarchySoundEvents { public static Supplier NIGHTMARE_DEATH = (Supplier) UNBOUND; public static Supplier NIGHTMARE_BITE = (Supplier) UNBOUND; public static Supplier NIGHTMARE_FLAP = (Supplier) UNBOUND; - public static Supplier TRIFFID_ATTACK = (Supplier) UNBOUND; - public static Supplier TRIFFID_GRAB = (Supplier) UNBOUND; - public static Supplier TRIFFID_HURT = (Supplier) UNBOUND; - public static Supplier TRIFFID_DEATH = (Supplier) UNBOUND; - public static Supplier TRIFFID_HISS = (Supplier) UNBOUND; - public static Supplier TRIFFID_GROWL = (Supplier) UNBOUND; + public static Supplier FLYTRAP_ATTACK = (Supplier) UNBOUND; + public static Supplier FLYTRAP_GRAB = (Supplier) UNBOUND; + public static Supplier FLYTRAP_HURT = (Supplier) UNBOUND; + public static Supplier FLYTRAP_DEATH = (Supplier) UNBOUND; + public static Supplier FLYTRAP_HISS = (Supplier) UNBOUND; + public static Supplier FLYTRAP_GROWL = (Supplier) UNBOUND; public static Supplier MANTIS_AMBIENT = (Supplier) UNBOUND; public static Supplier MANTIS_HURT = (Supplier) UNBOUND; public static Supplier MANTIS_ATTACK = (Supplier) UNBOUND; @@ -145,13 +145,13 @@ public final class AntarchySoundEvents { public static Supplier STINK_BUG_IDLE = (Supplier) UNBOUND; public static Supplier CAVARYN_HEARTBEAT = (Supplier) UNBOUND; public static Supplier ROLLY_POLLY_IDLE = (Supplier) UNBOUND; - public static Supplier CREEPING_HORROR_GROWL = (Supplier) UNBOUND; - public static Supplier CREEPING_HORROR_HURT = (Supplier) UNBOUND; - public static Supplier CREEPING_HORROR_BITE = (Supplier) UNBOUND; - public static Supplier LURKING_TERROR_SNARL = (Supplier) UNBOUND; - public static Supplier LURKING_TERROR_HURT = (Supplier) UNBOUND; - public static Supplier LURKING_TERROR_BITE = (Supplier) UNBOUND; - public static Supplier LURKING_TERROR_FLY_LOOP = (Supplier) UNBOUND; + public static Supplier CRAWLING_BLIGHT_GROWL = (Supplier) UNBOUND; + public static Supplier CRAWLING_BLIGHT_HURT = (Supplier) UNBOUND; + public static Supplier CRAWLING_BLIGHT_BITE = (Supplier) UNBOUND; + public static Supplier SKULKING_FRIGHT_SNARL = (Supplier) UNBOUND; + public static Supplier SKULKING_FRIGHT_HURT = (Supplier) UNBOUND; + public static Supplier SKULKING_FRIGHT_BITE = (Supplier) UNBOUND; + public static Supplier SKULKING_FRIGHT_FLY_LOOP = (Supplier) UNBOUND; public static Supplier DUCT_TAPE_USE = (Supplier) UNBOUND; public static Supplier HERCULES_BEETLE_IDLE = (Supplier) UNBOUND; public static Supplier HERCULES_BEETLE_HURT = (Supplier) UNBOUND; @@ -159,10 +159,10 @@ public final class AntarchySoundEvents { public static Supplier HERCULES_BEETLE_CRY = (Supplier) UNBOUND; public static Supplier HERCULES_BEETLE_CHARGE_START = (Supplier) UNBOUND; public static Supplier HERCULES_BEETLE_KNOCKED_DOWN = (Supplier) UNBOUND; - public static Supplier JUMPY_BUG_IDLE = (Supplier) UNBOUND; + public static Supplier SPRINGBUG_IDLE = (Supplier) UNBOUND; public static Supplier SPIT_BUG_IDLE = (Supplier) UNBOUND; - public static Supplier JUMPY_BUG_HURT = (Supplier) UNBOUND; - public static Supplier JUMPY_BUG_JUMP = (Supplier) UNBOUND; + public static Supplier SPRINGBUG_HURT = (Supplier) UNBOUND; + public static Supplier SPRINGBUG_JUMP = (Supplier) UNBOUND; public static Supplier SPIT_BUG_HURT = (Supplier) UNBOUND; public static Supplier SPIT_BUG_SPIT = (Supplier) UNBOUND; public static Supplier BRUTALFLY_SPIT = (Supplier) UNBOUND; @@ -235,11 +235,11 @@ public final class AntarchySoundEvents { Supplier antBite, Supplier antGather, Supplier antNest, - Supplier cloudSharkBite, - Supplier cloudSharkIdle, - Supplier cloudSharkHurt, - Supplier cloudSharkDeath, - Supplier cloudSharkFly, + Supplier stratosharkBite, + Supplier stratosharkIdle, + Supplier stratosharkHurt, + Supplier stratosharkDeath, + Supplier stratosharkFly, Supplier caterpillarIdle, Supplier caterpillarHurt, Supplier caterpillarCrawl, @@ -299,12 +299,12 @@ public final class AntarchySoundEvents { Supplier nightmareDeath, Supplier nightmareBite, Supplier nightmareFlap, - Supplier triffidAttack, - Supplier triffidGrab, - Supplier triffidHurt, - Supplier triffidDeath, - Supplier triffidHiss, - Supplier triffidGrowl, + Supplier flytrapAttack, + Supplier flytrapGrab, + Supplier flytrapHurt, + Supplier flytrapDeath, + Supplier flytrapHiss, + Supplier flytrapGrowl, Supplier mantisAmbient, Supplier mantisHurt, Supplier mantisAttack, @@ -353,13 +353,13 @@ public final class AntarchySoundEvents { Supplier stinkBugIdle, Supplier cavarynHeartbeat, Supplier rollyPollyIdle, - Supplier creepingHorrorGrowl, - Supplier creepingHorrorHurt, - Supplier creepingHorrorBite, - Supplier lurkingTerrorSnarl, - Supplier lurkingTerrorHurt, - Supplier lurkingTerrorBite, - Supplier lurkingTerrorFlyLoop, + Supplier crawlingBlightGrowl, + Supplier crawlingBlightHurt, + Supplier crawlingBlightBite, + Supplier skulkingFrightSnarl, + Supplier skulkingFrightHurt, + Supplier skulkingFrightBite, + Supplier skulkingFrightFlyLoop, Supplier ductTapeUse, Supplier herculesBeetleIdle, Supplier herculesBeetleHurt, @@ -367,10 +367,10 @@ public final class AntarchySoundEvents { Supplier herculesBeetleCry, Supplier herculesBeetleChargeStart, Supplier herculesBeetleKnockedDown, - Supplier jumpyBugIdle, + Supplier springbugIdle, Supplier spitBugIdle, - Supplier jumpyBugHurt, - Supplier jumpyBugJump, + Supplier springbugHurt, + Supplier springbugJump, Supplier spitBugHurt, Supplier spitBugSpit, Supplier brutalflySpit, @@ -439,11 +439,11 @@ public final class AntarchySoundEvents { ANT_BITE = antBite; ANT_GATHER = antGather; ANT_NEST = antNest; - CLOUD_SHARK_BITE = cloudSharkBite; - CLOUD_SHARK_IDLE = cloudSharkIdle; - CLOUD_SHARK_HURT = cloudSharkHurt; - CLOUD_SHARK_DEATH = cloudSharkDeath; - CLOUD_SHARK_FLY = cloudSharkFly; + STRATOSHARK_BITE = stratosharkBite; + STRATOSHARK_IDLE = stratosharkIdle; + STRATOSHARK_HURT = stratosharkHurt; + STRATOSHARK_DEATH = stratosharkDeath; + STRATOSHARK_FLY = stratosharkFly; CATERPILLAR_IDLE = caterpillarIdle; CATERPILLAR_HURT = caterpillarHurt; CATERPILLAR_CRAWL = caterpillarCrawl; @@ -503,12 +503,12 @@ public final class AntarchySoundEvents { NIGHTMARE_DEATH = nightmareDeath; NIGHTMARE_BITE = nightmareBite; NIGHTMARE_FLAP = nightmareFlap; - TRIFFID_ATTACK = triffidAttack; - TRIFFID_GRAB = triffidGrab; - TRIFFID_HURT = triffidHurt; - TRIFFID_DEATH = triffidDeath; - TRIFFID_HISS = triffidHiss; - TRIFFID_GROWL = triffidGrowl; + FLYTRAP_ATTACK = flytrapAttack; + FLYTRAP_GRAB = flytrapGrab; + FLYTRAP_HURT = flytrapHurt; + FLYTRAP_DEATH = flytrapDeath; + FLYTRAP_HISS = flytrapHiss; + FLYTRAP_GROWL = flytrapGrowl; MANTIS_AMBIENT = mantisAmbient; MANTIS_HURT = mantisHurt; MANTIS_ATTACK = mantisAttack; @@ -557,13 +557,13 @@ public final class AntarchySoundEvents { STINK_BUG_IDLE = stinkBugIdle; CAVARYN_HEARTBEAT = cavarynHeartbeat; ROLLY_POLLY_IDLE = rollyPollyIdle; - CREEPING_HORROR_GROWL = creepingHorrorGrowl; - CREEPING_HORROR_HURT = creepingHorrorHurt; - CREEPING_HORROR_BITE = creepingHorrorBite; - LURKING_TERROR_SNARL = lurkingTerrorSnarl; - LURKING_TERROR_HURT = lurkingTerrorHurt; - LURKING_TERROR_BITE = lurkingTerrorBite; - LURKING_TERROR_FLY_LOOP = lurkingTerrorFlyLoop; + CRAWLING_BLIGHT_GROWL = crawlingBlightGrowl; + CRAWLING_BLIGHT_HURT = crawlingBlightHurt; + CRAWLING_BLIGHT_BITE = crawlingBlightBite; + SKULKING_FRIGHT_SNARL = skulkingFrightSnarl; + SKULKING_FRIGHT_HURT = skulkingFrightHurt; + SKULKING_FRIGHT_BITE = skulkingFrightBite; + SKULKING_FRIGHT_FLY_LOOP = skulkingFrightFlyLoop; DUCT_TAPE_USE = ductTapeUse; HERCULES_BEETLE_IDLE = herculesBeetleIdle; HERCULES_BEETLE_HURT = herculesBeetleHurt; @@ -571,10 +571,10 @@ public final class AntarchySoundEvents { HERCULES_BEETLE_CRY = herculesBeetleCry; HERCULES_BEETLE_CHARGE_START = herculesBeetleChargeStart; HERCULES_BEETLE_KNOCKED_DOWN = herculesBeetleKnockedDown; - JUMPY_BUG_IDLE = jumpyBugIdle; + SPRINGBUG_IDLE = springbugIdle; SPIT_BUG_IDLE = spitBugIdle; - JUMPY_BUG_HURT = jumpyBugHurt; - JUMPY_BUG_JUMP = jumpyBugJump; + SPRINGBUG_HURT = springbugHurt; + SPRINGBUG_JUMP = springbugJump; SPIT_BUG_HURT = spitBugHurt; SPIT_BUG_SPIT = spitBugSpit; BRUTALFLY_SPIT = brutalflySpit; 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 f72bf3c1..5f443be5 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 @@ -76,7 +76,7 @@ public final class AntarchyTags { public static final TagKey> CRITTER_CAGE_BLACKLIST = TagKey.create(Registries.ENTITY_TYPE, id("critter_cage_blacklist")); public static final TagKey> PARALYSIS_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, id("paralysis_immune")); public static final TagKey> HUSHWEED_TARGETS = TagKey.create(Registries.ENTITY_TYPE, id("hushweed_targets")); - public static final TagKey> TRIFFID_PREY = TagKey.create(Registries.ENTITY_TYPE, id("triffid_prey")); + public static final TagKey> FLYTRAP_PREY = TagKey.create(Registries.ENTITY_TYPE, id("flytrap_prey")); public static final TagKey> STINKY_REPELLED_HOSTILES = TagKey.create(Registries.ENTITY_TYPE, id("stinky_repelled_hostiles")); public static final TagKey> SCORPION_WHIP_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, id("scorpion_whip_immune")); public static final TagKey> SCORPION_WHIP_BLACKLIST = TagKey.create(Registries.ENTITY_TYPE, id("scorpion_whip_blacklist")); diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/CreepingHorrorEggBlock.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/CrawlingBlightEggBlock.java similarity index 93% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/CreepingHorrorEggBlock.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/CrawlingBlightEggBlock.java index 0c09713e..10b52582 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/CreepingHorrorEggBlock.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/CrawlingBlightEggBlock.java @@ -1,9 +1,9 @@ package com.craisinlord.antarchy.content.block; import com.craisinlord.antarchy.content.AntarchyObjects; -import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity; +import com.craisinlord.antarchy.content.entity.CrawlingBlightEntity; import com.craisinlord.antarchy.content.block.AmberMossBlock; -import com.craisinlord.antarchy.content.block.LurkingTerrorEggBlock; +import com.craisinlord.antarchy.content.block.SkulkingFrightEggBlock; import com.craisinlord.antarchy.content.horde.CavarynHordeManager; import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; @@ -33,8 +33,8 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -public class CreepingHorrorEggBlock extends Block { - public static final MapCodec CODEC = Block.simpleCodec(CreepingHorrorEggBlock::new); +public class CrawlingBlightEggBlock extends Block { + public static final MapCodec CODEC = Block.simpleCodec(CrawlingBlightEggBlock::new); public static final IntegerProperty HATCH = BlockStateProperties.HATCH; public static final IntegerProperty EGGS = BlockStateProperties.EGGS; private static final float PANIC_HATCH_CHANCE = 0.25F; @@ -44,13 +44,13 @@ public class CreepingHorrorEggBlock extends Block { private static final VoxelShape SINGLE_SHAPE = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 7.0D, 13.0D); private static final VoxelShape MULTI_SHAPE = Block.box(1.0D, 0.0D, 1.0D, 15.0D, 7.0D, 15.0D); - public CreepingHorrorEggBlock(BlockBehaviour.Properties properties) { + public CrawlingBlightEggBlock(BlockBehaviour.Properties properties) { super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(HATCH, 0).setValue(EGGS, 1)); } @Override - public MapCodec codec() { + public MapCodec codec() { return CODEC; } @@ -145,9 +145,9 @@ public class CreepingHorrorEggBlock extends Block { mutable.set(origin.getX() + dx, origin.getY() + dy, origin.getZ() + dz); BlockState nearby = level.getBlockState(mutable); BlockPos immutable = mutable.immutable(); - if (nearby.getBlock() instanceof CreepingHorrorEggBlock b) { + if (nearby.getBlock() instanceof CrawlingBlightEggBlock b) { b.hatchPanickedEggs(level, immutable, nearby, level.random); - } else if (nearby.getBlock() instanceof LurkingTerrorEggBlock b) { + } else if (nearby.getBlock() instanceof SkulkingFrightEggBlock b) { b.hatchPanickedEggs(level, immutable, nearby, level.random); } } @@ -195,7 +195,7 @@ public class CreepingHorrorEggBlock extends Block { level.playSound(null, pos, SoundEvents.TURTLE_EGG_HATCH, SoundSource.BLOCKS, 0.75F, 0.95F + random.nextFloat() * 0.1F); for (int i = 0; i < eggsToHatch; i++) { - CreepingHorrorEntity entity = AntarchyObjects.CREEPING_HORROR.get().create(level); + CrawlingBlightEntity entity = AntarchyObjects.CRAWLING_BLIGHT.get().create(level); if (entity == null) { continue; } @@ -240,7 +240,7 @@ public class CreepingHorrorEggBlock extends Block { } private boolean canDestroyEgg(Level level, Entity entity) { - if (entity instanceof CreepingHorrorEntity || entity instanceof Bat) { + if (entity instanceof CrawlingBlightEntity || entity instanceof Bat) { return false; } if (entity instanceof net.minecraft.world.entity.LivingEntity) { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/TriffidGooBlock.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/FlytrapGooBlock.java similarity index 96% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/TriffidGooBlock.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/FlytrapGooBlock.java index 0e15050c..37706b12 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/TriffidGooBlock.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/FlytrapGooBlock.java @@ -15,13 +15,13 @@ import net.minecraft.world.phys.shapes.EntityCollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -public class TriffidGooBlock extends Block { +public class FlytrapGooBlock extends Block { private static final double BOUNCE_VELOCITY_THRESHOLD = 0.6; private static final double MAX_SINK_SPEED = 0.05; private static final double SPRINT_VELOCITY_THRESHOLD = 0.1; - public TriffidGooBlock(BlockBehaviour.Properties properties) { + public FlytrapGooBlock(BlockBehaviour.Properties properties) { super(properties); } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/QueenTrailSpawnMarkerBlock.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/QueenTrailSpawnMarkerBlock.java new file mode 100644 index 00000000..d62f6386 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/QueenTrailSpawnMarkerBlock.java @@ -0,0 +1,54 @@ +package com.craisinlord.antarchy.content.block; + +import com.craisinlord.antarchy.content.block.entity.QueenTrailSpawnMarkerBlockEntity; +import com.mojang.serialization.MapCodec; +import java.util.function.Supplier; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; + +public final class QueenTrailSpawnMarkerBlock extends BaseEntityBlock { + private final Supplier> blockEntityTypeSupplier; + private final MapCodec codec; + + public QueenTrailSpawnMarkerBlock(Supplier> blockEntityTypeSupplier, BlockBehaviour.Properties properties) { + super(properties); + this.blockEntityTypeSupplier = blockEntityTypeSupplier; + this.codec = Block.simpleCodec(ignored -> this); + } + + @Override + public MapCodec codec() { + return this.codec; + } + + @Override + protected RenderShape getRenderShape(BlockState state) { + return RenderShape.INVISIBLE; + } + + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new QueenTrailSpawnMarkerBlockEntity(pos, state, this.blockEntityTypeSupplier); + } + + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType blockEntityType) { + if (level.isClientSide) { + return null; + } + return createTickerHelper(blockEntityType, this.blockEntityTypeSupplier.get(), (tickLevel, tickPos, tickState, marker) -> { + if (tickLevel instanceof ServerLevel serverLevel) { + QueenTrailSpawnMarkerBlockEntity.serverTick(serverLevel, marker); + } + }); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/LurkingTerrorEggBlock.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/SkulkingFrightEggBlock.java similarity index 92% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/LurkingTerrorEggBlock.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/SkulkingFrightEggBlock.java index 8a05880c..bb80098b 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/LurkingTerrorEggBlock.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/SkulkingFrightEggBlock.java @@ -1,9 +1,9 @@ package com.craisinlord.antarchy.content.block; import com.craisinlord.antarchy.content.AntarchyObjects; -import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity; +import com.craisinlord.antarchy.content.entity.SkulkingFrightEntity; import com.craisinlord.antarchy.content.block.AmberMossBlock; -import com.craisinlord.antarchy.content.block.CreepingHorrorEggBlock; +import com.craisinlord.antarchy.content.block.CrawlingBlightEggBlock; import com.craisinlord.antarchy.content.horde.CavarynHordeManager; import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; @@ -33,8 +33,8 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -public class LurkingTerrorEggBlock extends Block { - public static final MapCodec CODEC = Block.simpleCodec(LurkingTerrorEggBlock::new); +public class SkulkingFrightEggBlock extends Block { + public static final MapCodec CODEC = Block.simpleCodec(SkulkingFrightEggBlock::new); public static final IntegerProperty HATCH = BlockStateProperties.HATCH; public static final IntegerProperty EGGS = BlockStateProperties.EGGS; private static final float PANIC_HATCH_CHANCE = 0.25F; @@ -44,13 +44,13 @@ public class LurkingTerrorEggBlock extends Block { private static final VoxelShape SINGLE_SHAPE = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 7.0D, 13.0D); private static final VoxelShape MULTI_SHAPE = Block.box(1.0D, 0.0D, 1.0D, 15.0D, 7.0D, 15.0D); - public LurkingTerrorEggBlock(BlockBehaviour.Properties properties) { + public SkulkingFrightEggBlock(BlockBehaviour.Properties properties) { super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(HATCH, 0).setValue(EGGS, 1)); } @Override - public MapCodec codec() { + public MapCodec codec() { return CODEC; } @@ -145,9 +145,9 @@ public class LurkingTerrorEggBlock extends Block { mutable.set(origin.getX() + dx, origin.getY() + dy, origin.getZ() + dz); BlockState nearby = level.getBlockState(mutable); BlockPos immutable = mutable.immutable(); - if (nearby.getBlock() instanceof LurkingTerrorEggBlock b) { + if (nearby.getBlock() instanceof SkulkingFrightEggBlock b) { b.hatchPanickedEggs(level, immutable, nearby, level.random); - } else if (nearby.getBlock() instanceof CreepingHorrorEggBlock b) { + } else if (nearby.getBlock() instanceof CrawlingBlightEggBlock b) { b.hatchPanickedEggs(level, immutable, nearby, level.random); } } @@ -195,7 +195,7 @@ public class LurkingTerrorEggBlock extends Block { level.playSound(null, pos, SoundEvents.TURTLE_EGG_HATCH, SoundSource.BLOCKS, 0.75F, 0.95F + random.nextFloat() * 0.1F); for (int i = 0; i < eggsToHatch; i++) { - LurkingTerrorEntity entity = AntarchyObjects.LURKING_TERROR.get().create(level); + SkulkingFrightEntity entity = AntarchyObjects.SKULKING_FRIGHT.get().create(level); if (entity == null) { continue; } @@ -240,7 +240,7 @@ public class LurkingTerrorEggBlock extends Block { } private boolean canDestroyEgg(Level level, Entity entity) { - if (entity instanceof LurkingTerrorEntity || entity instanceof Bat) { + if (entity instanceof SkulkingFrightEntity || entity instanceof Bat) { return false; } if (entity instanceof net.minecraft.world.entity.LivingEntity) { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/JumpyBugEggBlock.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/SpringbugEggBlock.java similarity index 90% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/JumpyBugEggBlock.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/SpringbugEggBlock.java index f5dac862..cf76f162 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/JumpyBugEggBlock.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/SpringbugEggBlock.java @@ -1,7 +1,7 @@ package com.craisinlord.antarchy.content.block; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.entity.JumpyBugEntity; +import com.craisinlord.antarchy.content.entity.SpringbugEntity; import com.craisinlord.antarchy.content.horde.CavarynHordeManager; import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; @@ -32,8 +32,8 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -public class JumpyBugEggBlock extends Block { - public static final MapCodec CODEC = Block.simpleCodec(JumpyBugEggBlock::new); +public class SpringbugEggBlock extends Block { + public static final MapCodec CODEC = Block.simpleCodec(SpringbugEggBlock::new); public static final IntegerProperty HATCH = BlockStateProperties.HATCH; public static final BooleanProperty HANGING = BlockStateProperties.HANGING; public static final BooleanProperty ROTATED = BooleanProperty.create("rotated"); @@ -44,15 +44,15 @@ public class JumpyBugEggBlock extends Block { private static final int PLAYER_PROXIMITY_CHECK_INTERVAL = 200; private static final VoxelShape FLOOR_SHAPE = Block.box(1.5D, 0.0D, 1.5D, 14.5D, 16.0D, 14.5D); private static final VoxelShape CEILING_SHAPE = Block.box(1.5D, 0.0D, 1.5D, 14.5D, 16.0D, 14.5D); - private static final ResourceLocation JUMPY_BUG_ID = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "jumpy_bug"); + private static final ResourceLocation SPRINGBUG_ID = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "springbug"); - public JumpyBugEggBlock(BlockBehaviour.Properties properties) { + public SpringbugEggBlock(BlockBehaviour.Properties properties) { super(properties); this.registerDefaultState(this.stateDefinition.any().setValue(HATCH, 0).setValue(HANGING, false).setValue(ROTATED, false)); } @Override - public MapCodec codec() { + public MapCodec codec() { return CODEC; } @@ -142,11 +142,11 @@ public class JumpyBugEggBlock extends Block { level.removeBlock(pos, false); level.playSound(null, pos, SoundEvents.TURTLE_EGG_HATCH, SoundSource.BLOCKS, 0.75F, 0.95F + random.nextFloat() * 0.1F); @SuppressWarnings("unchecked") - EntityType jumpyBugType = (EntityType) (EntityType) BuiltInRegistries.ENTITY_TYPE.getOptional(JUMPY_BUG_ID).orElse(null); - if (jumpyBugType == null) { + EntityType springbugType = (EntityType) (EntityType) BuiltInRegistries.ENTITY_TYPE.getOptional(SPRINGBUG_ID).orElse(null); + if (springbugType == null) { return; } - JumpyBugEntity entity = jumpyBugType.create(level); + SpringbugEntity entity = springbugType.create(level); if (entity == null) { return; } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UnderVaultBlock.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UnderVaultBlock.java new file mode 100644 index 00000000..ecf820fb --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UnderVaultBlock.java @@ -0,0 +1,77 @@ +package com.craisinlord.antarchy.content.block; + +import com.craisinlord.antarchy.content.block.entity.UnderVaultBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.VaultBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.DirectionProperty; + +import java.util.function.Supplier; + +public final class UnderVaultBlock extends VaultBlock { + public static final DirectionProperty UNDER_FACING = DirectionProperty.create("under_facing", Direction.values()); + private final Supplier> blockEntityType; + + public UnderVaultBlock(Supplier> blockEntityType, BlockBehaviour.Properties properties) { + super(properties); + this.blockEntityType = blockEntityType; + this.registerDefaultState(this.defaultBlockState().setValue(UNDER_FACING, Direction.NORTH)); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + super.createBlockStateDefinition(builder); + builder.add(UNDER_FACING); + } + + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + if (context.getClickedFace() != Direction.DOWN) { + return null; + } + return this.defaultBlockState() + .setValue(FACING, context.getHorizontalDirection().getOpposite()) + .setValue(UNDER_FACING, Direction.DOWN); + } + + @Override + public BlockState rotate(BlockState state, Rotation rotation) { + return super.rotate(state, rotation).setValue(UNDER_FACING, rotation.rotate(state.getValue(UNDER_FACING))); + } + + @Override + public BlockState mirror(BlockState state, Mirror mirror) { + return super.mirror(state, mirror).setValue(UNDER_FACING, mirror.getRotation(state.getValue(UNDER_FACING)).rotate(state.getValue(UNDER_FACING))); + } + + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new UnderVaultBlockEntity(pos, state, blockEntityType); + } + + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (this.blockEntityType == null || type != this.blockEntityType.get()) { + return null; + } + if (level.isClientSide) { + return (BlockEntityTicker) (BlockEntityTicker) UnderVaultBlockEntity::clientTick; + } + return (BlockEntityTicker) (BlockEntityTicker) ((serverLevel, pos, blockState, blockEntity) -> { + if (serverLevel instanceof ServerLevel levelServer) { + UnderVaultBlockEntity.serverTick(levelServer, pos, blockState, blockEntity); + } + }); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UndertrialSpawnerBlock.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UndertrialSpawnerBlock.java new file mode 100644 index 00000000..adbc3ee5 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/UndertrialSpawnerBlock.java @@ -0,0 +1,79 @@ +package com.craisinlord.antarchy.content.block; + +import com.craisinlord.antarchy.content.AntarchyObjects; +import com.craisinlord.antarchy.content.block.entity.UndertrialSpawnerBlockEntity; +import com.mojang.serialization.MapCodec; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.level.block.state.properties.EnumProperty; + +import java.util.function.Supplier; + +public final class UndertrialSpawnerBlock extends BaseEntityBlock { + public static final MapCodec CODEC = MapCodec.unit(() -> new UndertrialSpawnerBlock(null, BlockBehaviour.Properties.of())); + public static final EnumProperty STATE = BlockStateProperties.TRIAL_SPAWNER_STATE; + public static final BooleanProperty OMINOUS = BlockStateProperties.OMINOUS; + private final Supplier> blockEntityType; + + public UndertrialSpawnerBlock(Supplier> blockEntityType, BlockBehaviour.Properties properties) { + super(properties); + this.blockEntityType = blockEntityType; + this.registerDefaultState(this.stateDefinition.any() + .setValue(STATE, TrialSpawnerState.INACTIVE) + .setValue(OMINOUS, false)); + } + + @Override + public MapCodec codec() { + return CODEC; + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(STATE, OMINOUS); + } + + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + return context.getClickedFace() == Direction.DOWN ? this.defaultBlockState() : null; + } + + @Override + protected RenderShape getRenderShape(BlockState state) { + return RenderShape.MODEL; + } + + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new UndertrialSpawnerBlockEntity(pos, state, blockEntityType); + } + + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType blockEntityType) { + if (this.blockEntityType == null || blockEntityType != this.blockEntityType.get()) { + return null; + } + if (level.isClientSide) { + return (BlockEntityTicker) (BlockEntityTicker) UndertrialSpawnerBlockEntity::clientTick; + } + return (BlockEntityTicker) (BlockEntityTicker) ((tickLevel, tickPos, tickState, blockEntity) -> { + if (tickLevel instanceof net.minecraft.server.level.ServerLevel serverLevel) { + UndertrialSpawnerBlockEntity.serverTick(serverLevel, tickPos, tickState, blockEntity); + } + }); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/QueenTrailSpawnMarkerBlockEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/QueenTrailSpawnMarkerBlockEntity.java new file mode 100644 index 00000000..f0aa3d42 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/QueenTrailSpawnMarkerBlockEntity.java @@ -0,0 +1,97 @@ +package com.craisinlord.antarchy.content.block.entity; + +import com.craisinlord.antarchy.content.entity.royal.QueenEntity; +import java.util.UUID; +import java.util.function.Supplier; +import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.Difficulty; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; + +public final class QueenTrailSpawnMarkerBlockEntity extends BlockEntity { + private static final double ACTIVATION_DISTANCE_SQUARED = 96.0D * 96.0D; + private long siteId; + private BlockPos spawnPos = BlockPos.ZERO; + private BlockPos homePos = BlockPos.ZERO; + private float yaw; + private boolean configured; + private boolean consumed; + @Nullable + private UUID queenUuid; + + public QueenTrailSpawnMarkerBlockEntity(BlockPos pos, BlockState state, Supplier> typeSupplier) { + super(typeSupplier.get(), pos, state); + } + + public void configure(long siteId, BlockPos spawnPos, BlockPos homePos, float yaw) { + this.siteId = siteId; + this.spawnPos = spawnPos.immutable(); + this.homePos = homePos.immutable(); + this.yaw = yaw; + this.configured = true; + this.setChanged(); + } + + public long getSiteId() { + return this.siteId; + } + + public BlockPos getSpawnPos() { + return this.spawnPos; + } + + public boolean isConfigured() { + return this.configured; + } + + public static void serverTick(ServerLevel level, QueenTrailSpawnMarkerBlockEntity marker) { + if (!marker.configured || marker.consumed || level.getDifficulty() == Difficulty.PEACEFUL) { + return; + } + if (Math.floorMod(level.getGameTime(), 20L) != Math.floorMod(marker.siteId, 20L)) { + return; + } + boolean nearbyPlayer = level.players().stream().anyMatch(player -> !player.isSpectator() + && player.distanceToSqr(marker.spawnPos.getX() + 0.5D, marker.spawnPos.getY() + 0.5D, marker.spawnPos.getZ() + 0.5D) <= ACTIVATION_DISTANCE_SQUARED); + if (!nearbyPlayer || !level.hasChunkAt(marker.spawnPos)) { + return; + } + QueenEntity queen = QueenEntity.spawnFromUndersideTrail(level, marker.spawnPos, marker.homePos, marker.siteId, marker.yaw); + if (queen != null) { + marker.consumed = true; + marker.queenUuid = queen.getUUID(); + marker.setChanged(); + } + } + + @Override + protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.saveAdditional(tag, registries); + tag.putLong("site_id", this.siteId); + tag.putLong("spawn_pos", this.spawnPos.asLong()); + tag.putLong("home_pos", this.homePos.asLong()); + tag.putFloat("yaw", this.yaw); + tag.putBoolean("configured", this.configured); + tag.putBoolean("consumed", this.consumed); + if (this.queenUuid != null) { + tag.putUUID("queen_uuid", this.queenUuid); + } + } + + @Override + protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.loadAdditional(tag, registries); + this.siteId = tag.getLong("site_id"); + this.spawnPos = BlockPos.of(tag.getLong("spawn_pos")); + this.homePos = BlockPos.of(tag.getLong("home_pos")); + this.yaw = tag.getFloat("yaw"); + this.configured = tag.getBoolean("configured"); + this.consumed = tag.getBoolean("consumed"); + this.queenUuid = tag.hasUUID("queen_uuid") ? tag.getUUID("queen_uuid") : null; + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UnderVaultBlockEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UnderVaultBlockEntity.java new file mode 100644 index 00000000..f3da69a7 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UnderVaultBlockEntity.java @@ -0,0 +1,97 @@ +package com.craisinlord.antarchy.content.block.entity; + +import com.craisinlord.antarchy.Antarchy; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ClientGamePacketListener; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.vault.VaultConfig; +import net.minecraft.world.level.block.entity.vault.VaultState; +import net.minecraft.world.level.block.entity.vault.VaultBlockEntity; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.phys.Vec3; + +import java.util.Optional; +import java.util.function.Supplier; + +public final class UnderVaultBlockEntity extends BlockEntity { + private final VaultBlockEntity vaultData; + + public UnderVaultBlockEntity(BlockPos pos, BlockState state, Supplier> type) { + super(type.get(), pos, state); + this.vaultData = new VaultBlockEntity(pos, Blocks.VAULT.defaultBlockState()); + this.vaultData.setConfig(createConfig()); + } + + private static VaultConfig createConfig() { + return new VaultConfig(ResourceKey.create(net.minecraft.core.registries.Registries.LOOT_TABLE, + ResourceLocation.withDefaultNamespace("chests/trial_chambers/reward")), 4.0D, 4.0D, + new ItemStack(BuiltInRegistries.ITEM.get(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "undertrial_key"))), + Optional.empty()); + } + + public static void serverTick(ServerLevel level, BlockPos pos, BlockState state, UnderVaultBlockEntity blockEntity) { + blockEntity.vaultData.setLevel(level); + VaultBlockEntity.Server.tick(level, pos, state, blockEntity.vaultData.getConfig(), blockEntity.vaultData.getServerData(), blockEntity.vaultData.getSharedData()); + } + + public static void clientTick(Level level, BlockPos pos, BlockState state, UnderVaultBlockEntity blockEntity) { + blockEntity.vaultData.setLevel(level); + VaultBlockEntity.Client.tick(level, pos, state, blockEntity.vaultData.getClientData(), blockEntity.vaultData.getSharedData()); + if (level instanceof ClientLevel clientLevel && clientLevel.random.nextInt(4) == 0 + && (vaultState(state) == VaultState.ACTIVE || vaultState(state) == VaultState.UNLOCKING)) { + Player player = clientLevel.getNearestPlayer(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, 8.0D, false); + if (player != null) { + Vec3 start = Vec3.atCenterOf(pos); + Vec3 end = player.position().add(0.0D, player.getBbHeight() * 0.5D, 0.0D); + double progress = 0.15D + clientLevel.random.nextDouble() * 0.7D; + Vec3 point = start.lerp(end, progress); + clientLevel.addParticle((SimpleParticleType) BuiltInRegistries.PARTICLE_TYPE.get(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "undervault_connection")), point.x, point.y, point.z, 0.0D, 0.0D, 0.0D); + } + } + } + + @Override + protected void loadAdditional(CompoundTag tag, net.minecraft.core.HolderLookup.Provider registries) { + vaultData.loadCustomOnly(tag, registries); + } + + @Override + protected void saveAdditional(CompoundTag tag, net.minecraft.core.HolderLookup.Provider registries) { + tag.merge(vaultData.saveCustomOnly(registries)); + } + + @Override + public CompoundTag getUpdateTag(net.minecraft.core.HolderLookup.Provider registries) { + return vaultData.saveCustomOnly(registries); + } + + @Override + public Packet getUpdatePacket() { + return net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket.create(this); + } + + public VaultBlockEntity getVaultData() { + return vaultData; + } + + private static VaultState vaultState(BlockState state) { + return (VaultState) state.getValues().entrySet().stream() + .filter(entry -> entry.getKey().getName().equals("vault_state")) + .findFirst() + .orElseThrow() + .getValue(); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UndertrialSpawnerBlockEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UndertrialSpawnerBlockEntity.java new file mode 100644 index 00000000..faf88a50 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/block/entity/UndertrialSpawnerBlockEntity.java @@ -0,0 +1,144 @@ +package com.craisinlord.antarchy.content.block.entity; + +import com.craisinlord.antarchy.content.AntarchyObjects; +import com.craisinlord.antarchy.content.block.UndertrialSpawnerBlock; +import com.craisinlord.antarchy.Antarchy; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtOps; +import net.minecraft.resources.RegistryOps; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.Mob; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.trialspawner.TrialSpawner; +import net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerState; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; + +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import java.util.function.Supplier; + +public final class UndertrialSpawnerBlockEntity extends BlockEntity implements TrialSpawner.StateAccessor { + private static final String SPAWNER_TAG = "trial_spawner"; + private static final int EFFECT_DURATION = 3600; + private TrialSpawner trialSpawner; + private TrialSpawnerState previousClientState; + private double clientSpin; + private double clientOldSpin; + + public UndertrialSpawnerBlockEntity(BlockPos pos, BlockState state, Supplier> type) { + super(type.get(), pos, state); + this.trialSpawner = new TrialSpawner(this, net.minecraft.world.level.block.entity.trialspawner.PlayerDetector.INCLUDING_CREATIVE_PLAYERS, + net.minecraft.world.level.block.entity.trialspawner.PlayerDetector.EntitySelector.SELECT_FROM_LEVEL); + this.previousClientState = state.getValue(UndertrialSpawnerBlock.STATE); + } + + public static void serverTick(ServerLevel level, BlockPos pos, BlockState state, UndertrialSpawnerBlockEntity blockEntity) { + Set before = new HashSet<>(); + for (Mob mob : level.getEntitiesOfClass(Mob.class, new AABB(pos).inflate(16.0D))) { + before.add(mob.getUUID()); + } + blockEntity.trialSpawner.tickServer(level, pos, state.getValue(UndertrialSpawnerBlock.OMINOUS)); + for (Mob mob : level.getEntitiesOfClass(Mob.class, new AABB(pos).inflate(16.0D))) { + if (!before.contains(mob.getUUID())) { + blockEntity.applyUndertrialEffects(mob); + } + } + } + + public static void clientTick(Level level, BlockPos pos, BlockState state, UndertrialSpawnerBlockEntity blockEntity) { + TrialSpawnerState currentState = state.getValue(UndertrialSpawnerBlock.STATE); + blockEntity.clientOldSpin = blockEntity.clientSpin; + if (currentState == TrialSpawnerState.ACTIVE || currentState == TrialSpawnerState.WAITING_FOR_REWARD_EJECTION) { + blockEntity.clientSpin = (blockEntity.clientSpin + 4.0D) % 360.0D; + } + if (currentState == TrialSpawnerState.ACTIVE || currentState == TrialSpawnerState.WAITING_FOR_REWARD_EJECTION) { + if (level.random.nextInt(2) == 0) { + level.addParticle(blockEntity.particle("undertrial_omen"), pos.getX() + 0.5D + (level.random.nextDouble() - 0.5D) * 0.7D, + pos.getY() + 0.45D + level.random.nextDouble() * 0.35D, + pos.getZ() + 0.5D + (level.random.nextDouble() - 0.5D) * 0.7D, 0.0D, 0.01D, 0.0D); + } + } else if (currentState == TrialSpawnerState.WAITING_FOR_PLAYERS && blockEntity.previousClientState != currentState) { + for (int i = 0; i < 12; i++) { + level.addParticle(blockEntity.particle("undertrial_spawner_detection"), pos.getX() + 0.5D + (level.random.nextDouble() - 0.5D) * 1.4D, + pos.getY() + 0.15D + level.random.nextDouble() * 0.7D, + pos.getZ() + 0.5D + (level.random.nextDouble() - 0.5D) * 1.4D, 0.0D, 0.0D, 0.0D); + } + } + blockEntity.previousClientState = currentState; + } + + private SimpleParticleType particle(String id) { + return (SimpleParticleType) BuiltInRegistries.PARTICLE_TYPE.get(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, id)); + } + + private void applyUndertrialEffects(Mob mob) { + mob.addEffect(new MobEffectInstance(AntarchyObjects.INVERTED_EFFECT.get(), EFFECT_DURATION, 0, false, true, true)); + int roll = mob.getRandom().nextInt(100); + if (roll < 30) { + mob.addEffect(new MobEffectInstance(effect("contracted"), EFFECT_DURATION, 0, false, true, true)); + } else if (roll < 50) { + mob.addEffect(new MobEffectInstance(effect("shrinking"), EFFECT_DURATION, 0, false, true, true)); + } else if (roll < 65) { + mob.addEffect(new MobEffectInstance(effect("growth"), EFFECT_DURATION, 0, false, true, true)); + } + } + + private static net.minecraft.core.Holder effect(String path) { + return BuiltInRegistries.MOB_EFFECT.getHolderOrThrow(ResourceKey.create(Registries.MOB_EFFECT, + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, path))); + } + + @Override + protected void loadAdditional(CompoundTag tag, net.minecraft.core.HolderLookup.Provider registries) { + super.loadAdditional(tag, registries); + if (tag.contains(SPAWNER_TAG)) { + trialSpawner.codec().parse(RegistryOps.create(NbtOps.INSTANCE, registries), tag.get(SPAWNER_TAG)).result().ifPresent(decoded -> { + trialSpawner = decoded; + }); + } + } + + @Override + protected void saveAdditional(CompoundTag tag, net.minecraft.core.HolderLookup.Provider registries) { + super.saveAdditional(tag, registries); + trialSpawner.codec().encodeStart(RegistryOps.create(NbtOps.INSTANCE, registries), trialSpawner).result() + .ifPresent(encoded -> tag.put(SPAWNER_TAG, encoded)); + } + + @Override + public void setState(Level level, TrialSpawnerState state) { + level.setBlockAndUpdate(worldPosition, getBlockState().setValue(UndertrialSpawnerBlock.STATE, state)); + } + + @Override + public TrialSpawnerState getState() { + return getBlockState().getValue(UndertrialSpawnerBlock.STATE); + } + + @Override + public void markUpdated() { + setChanged(); + if (level != null) { + level.sendBlockUpdated(worldPosition, getBlockState(), getBlockState(), 3); + } + } + + public TrialSpawner getTrialSpawner() { + return trialSpawner; + } + + public double getClientSpin(float partialTick) { + return this.clientOldSpin + (this.clientSpin - this.clientOldSpin) * partialTick; + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CreepingHorrorModel.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CrawlingBlightModel.java similarity index 53% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CreepingHorrorModel.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CrawlingBlightModel.java index f96729cb..36a24804 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CreepingHorrorModel.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CrawlingBlightModel.java @@ -1,23 +1,23 @@ package com.craisinlord.antarchy.content.client.model; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity; +import com.craisinlord.antarchy.content.entity.CrawlingBlightEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; -public class CreepingHorrorModel extends GeoModel { +public class CrawlingBlightModel extends GeoModel { @Override - public ResourceLocation getModelResource(CreepingHorrorEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/creeping_horror.geo.json"); + public ResourceLocation getModelResource(CrawlingBlightEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/crawling_blight.geo.json"); } @Override - public ResourceLocation getTextureResource(CreepingHorrorEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/creeping_horror.png"); + public ResourceLocation getTextureResource(CrawlingBlightEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/crawling_blight.png"); } @Override - public ResourceLocation getAnimationResource(CreepingHorrorEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/creeping_horror.animation.json"); + public ResourceLocation getAnimationResource(CrawlingBlightEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/crawling_blight.animation.json"); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/TriffidModel.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/FlytrapModel.java similarity index 52% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/TriffidModel.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/FlytrapModel.java index b1a8cf55..c452b7f9 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/TriffidModel.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/FlytrapModel.java @@ -1,27 +1,27 @@ package com.craisinlord.antarchy.content.client.model; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.entity.TriffidEntity; +import com.craisinlord.antarchy.content.entity.FlytrapEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; -public class TriffidModel extends GeoModel { - private static final ResourceLocation MODEL = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/triffid.geo.json"); - private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/triffid.png"); - private static final ResourceLocation ANIMATION = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/triffid.animation.json"); +public class FlytrapModel extends GeoModel { + private static final ResourceLocation MODEL = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/flytrap.geo.json"); + private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/flytrap.png"); + private static final ResourceLocation ANIMATION = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/flytrap.animation.json"); @Override - public ResourceLocation getModelResource(TriffidEntity animatable) { + public ResourceLocation getModelResource(FlytrapEntity animatable) { return MODEL; } @Override - public ResourceLocation getTextureResource(TriffidEntity animatable) { + public ResourceLocation getTextureResource(FlytrapEntity animatable) { return TEXTURE; } @Override - public ResourceLocation getAnimationResource(TriffidEntity animatable) { + public ResourceLocation getAnimationResource(FlytrapEntity animatable) { return ANIMATION; } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/LurkingTerrorModel.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/LurkingTerrorModel.java deleted file mode 100644 index c5c995be..00000000 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/LurkingTerrorModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.craisinlord.antarchy.content.client.model; - -import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.model.GeoModel; - -public class LurkingTerrorModel extends GeoModel { - @Override - public ResourceLocation getModelResource(LurkingTerrorEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/lurking_terror.geo.json"); - } - - @Override - public ResourceLocation getTextureResource(LurkingTerrorEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/lurking_terror.png"); - } - - @Override - public ResourceLocation getAnimationResource(LurkingTerrorEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/lurking_terror.animation.json"); - } -} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/SkulkingFrightModel.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/SkulkingFrightModel.java new file mode 100644 index 00000000..d4b30e3a --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/SkulkingFrightModel.java @@ -0,0 +1,23 @@ +package com.craisinlord.antarchy.content.client.model; + +import com.craisinlord.antarchy.Antarchy; +import com.craisinlord.antarchy.content.entity.SkulkingFrightEntity; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.model.GeoModel; + +public class SkulkingFrightModel extends GeoModel { + @Override + public ResourceLocation getModelResource(SkulkingFrightEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/skulking_fright.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(SkulkingFrightEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/skulking_fright.png"); + } + + @Override + public ResourceLocation getAnimationResource(SkulkingFrightEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/skulking_fright.animation.json"); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/JumpyBugModel.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/SpringbugModel.java similarity index 52% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/JumpyBugModel.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/SpringbugModel.java index 56bef5f0..08379076 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/JumpyBugModel.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/SpringbugModel.java @@ -1,26 +1,26 @@ package com.craisinlord.antarchy.content.client.model; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.entity.JumpyBugEntity; +import com.craisinlord.antarchy.content.entity.SpringbugEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; -public class JumpyBugModel extends GeoModel { +public class SpringbugModel extends GeoModel { public static final ResourceLocation EMISSIVE_TEXTURE = - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/jumpy_bug_emissive.png"); + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/springbug_emissive.png"); @Override - public ResourceLocation getModelResource(JumpyBugEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/jumpy_bug.geo.json"); + public ResourceLocation getModelResource(SpringbugEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/springbug.geo.json"); } @Override - public ResourceLocation getTextureResource(JumpyBugEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/jumpy_bug.png"); + public ResourceLocation getTextureResource(SpringbugEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/springbug.png"); } @Override - public ResourceLocation getAnimationResource(JumpyBugEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/jumpy_bug.animation.json"); + public ResourceLocation getAnimationResource(SpringbugEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/springbug.animation.json"); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CloudSharkModel.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/StratosharkModel.java similarity index 53% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CloudSharkModel.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/StratosharkModel.java index c3ba81f4..10d5293a 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/CloudSharkModel.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/model/StratosharkModel.java @@ -1,28 +1,28 @@ package com.craisinlord.antarchy.content.client.model; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; -public class CloudSharkModel extends GeoModel { +public class StratosharkModel extends GeoModel { public static final ResourceLocation BASE_TEXTURE = - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/cloud_shark/cloud_shark.png"); + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/stratoshark/stratoshark.png"); public static final ResourceLocation EMISSIVE_TEXTURE = - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/cloud_shark/cloud_shark_emissive.png"); + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/stratoshark/stratoshark_emissive.png"); @Override - public ResourceLocation getModelResource(CloudSharkEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/cloud_shark.geo.json"); + public ResourceLocation getModelResource(StratosharkEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/stratoshark.geo.json"); } @Override - public ResourceLocation getTextureResource(CloudSharkEntity animatable) { + public ResourceLocation getTextureResource(StratosharkEntity animatable) { return BASE_TEXTURE; } @Override - public ResourceLocation getAnimationResource(CloudSharkEntity animatable) { - return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/cloud_shark.animation.json"); + public ResourceLocation getAnimationResource(StratosharkEntity animatable) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/stratoshark.animation.json"); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/particle/UndertrialParticle.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/particle/UndertrialParticle.java new file mode 100644 index 00000000..4525e74b --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/particle/UndertrialParticle.java @@ -0,0 +1,73 @@ +package com.craisinlord.antarchy.content.client.particle; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleProvider; +import net.minecraft.client.particle.ParticleRenderType; +import net.minecraft.client.particle.SpriteSet; +import net.minecraft.client.particle.TextureSheetParticle; +import net.minecraft.core.particles.SimpleParticleType; + +public final class UndertrialParticle extends TextureSheetParticle { + private final SpriteSet sprites; + private final boolean animated; + + private UndertrialParticle(ClientLevel level, double x, double y, double z, double xd, double yd, double zd, + SpriteSet sprites, boolean animated) { + super(level, x, y, z, xd, yd, zd); + this.sprites = sprites; + this.animated = animated; + this.xd = xd; + this.yd = yd; + this.zd = zd; + this.gravity = 0.0F; + this.friction = 0.96F; + this.hasPhysics = false; + this.quadSize = animated ? 0.16F + this.random.nextFloat() * 0.08F : 0.2F + this.random.nextFloat() * 0.1F; + this.lifetime = animated ? 10 : 24; + this.setAlpha(0.9F); + this.pickSprite(sprites); + } + + @Override + public void tick() { + super.tick(); + if (this.animated) { + this.setSprite(this.sprites.get(this.age, this.lifetime)); + } + this.setAlpha(0.9F * (1.0F - (float) this.age / (float) this.lifetime)); + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT; + } + + public static final class DetectionProvider implements ParticleProvider { + private final SpriteSet sprites; + + public DetectionProvider(SpriteSet sprites) { + this.sprites = sprites; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel level, double x, double y, double z, + double xd, double yd, double zd) { + return new UndertrialParticle(level, x, y, z, xd, yd, zd, this.sprites, true); + } + } + + public static final class OmenProvider implements ParticleProvider { + private final SpriteSet sprites; + + public OmenProvider(SpriteSet sprites) { + this.sprites = sprites; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel level, double x, double y, double z, + double xd, double yd, double zd) { + return new UndertrialParticle(level, x, y, z, xd, yd, zd, this.sprites, false); + } + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CreepingHorrorRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CrawlingBlightRenderer.java similarity index 72% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CreepingHorrorRenderer.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CrawlingBlightRenderer.java index 086b326b..d60e8c3c 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CreepingHorrorRenderer.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CrawlingBlightRenderer.java @@ -1,7 +1,7 @@ package com.craisinlord.antarchy.content.client.renderer; -import com.craisinlord.antarchy.content.client.model.CreepingHorrorModel; -import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity; +import com.craisinlord.antarchy.content.client.model.CrawlingBlightModel; +import com.craisinlord.antarchy.content.entity.CrawlingBlightEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; @@ -11,15 +11,15 @@ import org.jetbrains.annotations.Nullable; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.renderer.GeoEntityRenderer; -public class CreepingHorrorRenderer extends GeoEntityRenderer { - public CreepingHorrorRenderer(EntityRendererProvider.Context context) { - super(context, new CreepingHorrorModel()); +public class CrawlingBlightRenderer extends GeoEntityRenderer { + public CrawlingBlightRenderer(EntityRendererProvider.Context context) { + super(context, new CrawlingBlightModel()); this.shadowRadius = 0.5F; this.withScale(0.85F); } @Override - public void preRender(PoseStack poseStack, CreepingHorrorEntity animatable, BakedGeoModel model, @Nullable MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, boolean isReRender, float partialTick, int packedLight, int packedOverlay, int colour) { + public void preRender(PoseStack poseStack, CrawlingBlightEntity animatable, BakedGeoModel model, @Nullable MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, boolean isReRender, float partialTick, int packedLight, int packedOverlay, int colour) { super.preRender(poseStack, animatable, model, bufferSource, buffer, isReRender, partialTick, packedLight, packedOverlay, colour); if (animatable.isWallClimbing()) { poseStack.mulPose(Axis.XP.rotationDegrees(-90.0F)); diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/FlytrapRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/FlytrapRenderer.java new file mode 100644 index 00000000..f441d8b1 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/FlytrapRenderer.java @@ -0,0 +1,18 @@ +package com.craisinlord.antarchy.content.client.renderer; + +import com.craisinlord.antarchy.content.client.model.FlytrapModel; +import com.craisinlord.antarchy.content.entity.FlytrapEntity; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import software.bernie.geckolib.renderer.GeoEntityRenderer; + +public class FlytrapRenderer extends GeoEntityRenderer { + public FlytrapRenderer(EntityRendererProvider.Context context) { + super(context, new FlytrapModel()); + this.shadowRadius = 1.4F; + } + + @Override + protected float getDeathMaxRotation(FlytrapEntity animatable) { + return 0.0F; + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/LurkingTerrorRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/LurkingTerrorRenderer.java deleted file mode 100644 index c84ffa19..00000000 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/LurkingTerrorRenderer.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.craisinlord.antarchy.content.client.renderer; - -import com.craisinlord.antarchy.content.client.model.LurkingTerrorModel; -import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.renderer.GeoEntityRenderer; - -public class LurkingTerrorRenderer extends GeoEntityRenderer { - public LurkingTerrorRenderer(EntityRendererProvider.Context context) { - super(context, new LurkingTerrorModel()); - this.shadowRadius = 0.5F; - this.withScale(0.85F); - } -} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/SkulkingFrightRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/SkulkingFrightRenderer.java new file mode 100644 index 00000000..20adf2b2 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/SkulkingFrightRenderer.java @@ -0,0 +1,14 @@ +package com.craisinlord.antarchy.content.client.renderer; + +import com.craisinlord.antarchy.content.client.model.SkulkingFrightModel; +import com.craisinlord.antarchy.content.entity.SkulkingFrightEntity; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import software.bernie.geckolib.renderer.GeoEntityRenderer; + +public class SkulkingFrightRenderer extends GeoEntityRenderer { + public SkulkingFrightRenderer(EntityRendererProvider.Context context) { + super(context, new SkulkingFrightModel()); + this.shadowRadius = 0.5F; + this.withScale(0.85F); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/JumpyBugRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpringbugRenderer.java similarity index 64% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/JumpyBugRenderer.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpringbugRenderer.java index 28797c71..e69f6f31 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/JumpyBugRenderer.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/SpringbugRenderer.java @@ -1,7 +1,7 @@ package com.craisinlord.antarchy.content.client.renderer; -import com.craisinlord.antarchy.content.client.model.JumpyBugModel; -import com.craisinlord.antarchy.content.entity.JumpyBugEntity; +import com.craisinlord.antarchy.content.client.model.SpringbugModel; +import com.craisinlord.antarchy.content.entity.SpringbugEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; @@ -16,26 +16,26 @@ import software.bernie.geckolib.renderer.GeoEntityRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; import software.bernie.geckolib.util.Color; -public class JumpyBugRenderer extends GeoEntityRenderer { - public JumpyBugRenderer(EntityRendererProvider.Context context) { - super(context, new JumpyBugModel()); +public class SpringbugRenderer extends GeoEntityRenderer { + public SpringbugRenderer(EntityRendererProvider.Context context) { + super(context, new SpringbugModel()); this.shadowRadius = 6.0F; - this.addRenderLayer(new JumpyBugEmissiveLayer(this)); + this.addRenderLayer(new SpringbugEmissiveLayer(this)); } @Override - public RenderType getRenderType(JumpyBugEntity animatable, ResourceLocation texture, @Nullable MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(SpringbugEntity animatable, ResourceLocation texture, @Nullable MultiBufferSource bufferSource, float partialTick) { return animatable.isCamouflaged() ? RenderType.entityTranslucent(texture) : RenderType.entityCutoutNoCull(texture); } @Override - public Color getRenderColor(JumpyBugEntity animatable, float partialTick, int packedLight) { + public Color getRenderColor(SpringbugEntity animatable, float partialTick, int packedLight) { int alpha = Math.max(10, Math.min(255, Math.round(animatable.getVisualAlpha(partialTick) * 255.0F))); return Color.ofRGBA(255, 255, 255, alpha); } @Override - public void preRender(PoseStack poseStack, JumpyBugEntity animatable, BakedGeoModel model, @Nullable MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, boolean isReRender, float partialTick, int packedLight, int packedOverlay, int colour) { + public void preRender(PoseStack poseStack, SpringbugEntity animatable, BakedGeoModel model, @Nullable MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, boolean isReRender, float partialTick, int packedLight, int packedOverlay, int colour) { super.preRender(poseStack, animatable, model, bufferSource, buffer, isReRender, partialTick, packedLight, packedOverlay, colour); this.shadowRadius = animatable.isCamouflaged() ? 1.0F : 6.0F; @@ -45,18 +45,18 @@ public class JumpyBugRenderer extends GeoEntityRenderer { } } - private static final class JumpyBugEmissiveLayer extends GeoRenderLayer { - private JumpyBugEmissiveLayer(GeoEntityRenderer renderer) { + private static final class SpringbugEmissiveLayer extends GeoRenderLayer { + private SpringbugEmissiveLayer(GeoEntityRenderer renderer) { super(renderer); } @Override - public void render(PoseStack poseStack, JumpyBugEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, + public void render(PoseStack poseStack, SpringbugEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { RenderType emissiveType = animatable.isCamouflaged() - ? RenderType.entityTranslucent(JumpyBugModel.EMISSIVE_TEXTURE) - : RenderType.eyes(JumpyBugModel.EMISSIVE_TEXTURE); + ? RenderType.entityTranslucent(SpringbugModel.EMISSIVE_TEXTURE) + : RenderType.eyes(SpringbugModel.EMISSIVE_TEXTURE); int alpha = Math.max(10, Math.min(255, Math.round(animatable.getVisualAlpha(partialTick) * 255.0F))); int colour = (alpha << 24) | 0x00FFFFFF; VertexConsumer emissiveBuffer = bufferSource.getBuffer(emissiveType); diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CloudSharkRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/StratosharkRenderer.java similarity index 61% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CloudSharkRenderer.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/StratosharkRenderer.java index ec8e9a80..d9f9575d 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/CloudSharkRenderer.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/StratosharkRenderer.java @@ -1,7 +1,7 @@ package com.craisinlord.antarchy.content.client.renderer; -import com.craisinlord.antarchy.content.client.model.CloudSharkModel; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.client.model.StratosharkModel; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; @@ -14,30 +14,30 @@ import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.renderer.GeoEntityRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; -public class CloudSharkRenderer extends GeoEntityRenderer { +public class StratosharkRenderer extends GeoEntityRenderer { private static final float SHADOW_RADIUS = 0.6F; - public CloudSharkRenderer(EntityRendererProvider.Context context) { - super(context, new CloudSharkModel()); + public StratosharkRenderer(EntityRendererProvider.Context context) { + super(context, new StratosharkModel()); this.shadowRadius = SHADOW_RADIUS; - this.addRenderLayer(new CloudSharkEmissiveLayer(this)); + this.addRenderLayer(new StratosharkEmissiveLayer(this)); } @Override - public RenderType getRenderType(CloudSharkEntity animatable, ResourceLocation texture, @Nullable MultiBufferSource bufferSource, float partialTick) { + public RenderType getRenderType(StratosharkEntity animatable, ResourceLocation texture, @Nullable MultiBufferSource bufferSource, float partialTick) { return RenderType.entityCutoutNoCull(texture); } - private static final class CloudSharkEmissiveLayer extends GeoRenderLayer { - private CloudSharkEmissiveLayer(GeoEntityRenderer renderer) { + private static final class StratosharkEmissiveLayer extends GeoRenderLayer { + private StratosharkEmissiveLayer(GeoEntityRenderer renderer) { super(renderer); } @Override - public void render(PoseStack poseStack, CloudSharkEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, + public void render(PoseStack poseStack, StratosharkEntity animatable, BakedGeoModel bakedModel, @Nullable RenderType renderType, MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { - RenderType emissiveType = RenderType.eyes(CloudSharkModel.EMISSIVE_TEXTURE); + RenderType emissiveType = RenderType.eyes(StratosharkModel.EMISSIVE_TEXTURE); VertexConsumer emissiveBuffer = bufferSource.getBuffer(emissiveType); this.getRenderer().reRender( bakedModel, diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/TriffidRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/TriffidRenderer.java deleted file mode 100644 index 423eeb70..00000000 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/TriffidRenderer.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.craisinlord.antarchy.content.client.renderer; - -import com.craisinlord.antarchy.content.client.model.TriffidModel; -import com.craisinlord.antarchy.content.entity.TriffidEntity; -import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.renderer.GeoEntityRenderer; - -public class TriffidRenderer extends GeoEntityRenderer { - public TriffidRenderer(EntityRendererProvider.Context context) { - super(context, new TriffidModel()); - this.shadowRadius = 1.4F; - } - - @Override - protected float getDeathMaxRotation(TriffidEntity animatable) { - return 0.0F; - } -} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UnderVaultRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UnderVaultRenderer.java new file mode 100644 index 00000000..a1876c6c --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UnderVaultRenderer.java @@ -0,0 +1,21 @@ +package com.craisinlord.antarchy.content.client.renderer; + +import com.craisinlord.antarchy.content.block.entity.UnderVaultBlockEntity; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.client.renderer.blockentity.VaultRenderer; + +public final class UnderVaultRenderer implements BlockEntityRenderer { + private final VaultRenderer delegate; + + public UnderVaultRenderer(BlockEntityRendererProvider.Context context) { + this.delegate = new VaultRenderer(context); + } + + @Override + public void render(UnderVaultBlockEntity blockEntity, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight, int packedOverlay) { + this.delegate.render(blockEntity.getVaultData(), partialTick, poseStack, bufferSource, packedLight, packedOverlay); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UndertrialSpawnerRenderer.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UndertrialSpawnerRenderer.java new file mode 100644 index 00000000..6d0845e0 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/client/renderer/UndertrialSpawnerRenderer.java @@ -0,0 +1,35 @@ +package com.craisinlord.antarchy.content.client.renderer; + +import com.craisinlord.antarchy.content.block.entity.UndertrialSpawnerBlockEntity; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.client.renderer.blockentity.SpawnerRenderer; +import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.Level; + +public final class UndertrialSpawnerRenderer implements BlockEntityRenderer { + private final EntityRenderDispatcher entityRenderer; + + public UndertrialSpawnerRenderer(BlockEntityRendererProvider.Context context) { + this.entityRenderer = context.getEntityRenderer(); + } + + @Override + public void render(UndertrialSpawnerBlockEntity blockEntity, float partialTick, PoseStack poseStack, + MultiBufferSource buffer, int packedLight, int packedOverlay) { + Level level = blockEntity.getLevel(); + if (level == null) { + return; + } + var spawner = blockEntity.getTrialSpawner(); + var data = spawner.getData(); + Entity entity = data.getOrCreateDisplayEntity(spawner, level, spawner.getState()); + if (entity != null) { + SpawnerRenderer.renderEntityInSpawner(partialTick, poseStack, buffer, packedLight, entity, + entityRenderer, blockEntity.getClientSpin(partialTick), blockEntity.getClientSpin(partialTick)); + } + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/command/QueenLocateCommand.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/command/QueenLocateCommand.java new file mode 100644 index 00000000..f1f8eaab --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/command/QueenLocateCommand.java @@ -0,0 +1,101 @@ +package com.craisinlord.antarchy.content.command; + +import com.craisinlord.antarchy.Antarchy; +import com.craisinlord.antarchy.content.block.entity.QueenTrailSpawnMarkerBlockEntity; +import com.craisinlord.antarchy.content.worldgen.thoraxis.QueenTrailGrid; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.context.CommandContext; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.Mth; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; + +public final class QueenLocateCommand { + private static final ResourceKey THORAXIS = ResourceKey.create( + Registries.DIMENSION, + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "thoraxis") + ); + private static final int SEARCH_RADIUS_CELLS = 8; + private static final int MAX_SITE_CHECKS = 64; + + private QueenLocateCommand() { + } + + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(Commands.literal("locatequeen") + .requires(source -> source.hasPermission(2)) + .executes(QueenLocateCommand::locate)); + } + + private static int locate(CommandContext context) { + CommandSourceStack source = context.getSource(); + ServerLevel thoraxis = source.getServer().getLevel(THORAXIS); + if (thoraxis == null) { + source.sendFailure(Component.literal("Thoraxis is not available.")); + return 0; + } + + int originX = Mth.floor(source.getPosition().x); + int originZ = Mth.floor(source.getPosition().z); + int cellX = Math.floorDiv(originX, QueenTrailGrid.SPACING); + int cellZ = Math.floorDiv(originZ, QueenTrailGrid.SPACING); + List sites = new ArrayList<>(); + for (int x = cellX - SEARCH_RADIUS_CELLS; x <= cellX + SEARCH_RADIUS_CELLS; x++) { + for (int z = cellZ - SEARCH_RADIUS_CELLS; z <= cellZ + SEARCH_RADIUS_CELLS; z++) { + sites.add(QueenTrailGrid.site(thoraxis.getSeed(), x, z)); + } + } + sites.sort(Comparator.comparingDouble(site -> distanceSquared(originX, originZ, site))); + + int checks = Math.min(MAX_SITE_CHECKS, sites.size()); + for (int index = 0; index < checks; index++) { + QueenTrailGrid.Site site = sites.get(index); + thoraxis.getChunk(site.terminalX() >> 4, site.terminalZ() >> 4); + QueenTrailSpawnMarkerBlockEntity marker = findMarker(thoraxis, site); + if (marker == null) { + continue; + } + BlockPos spawn = marker.getSpawnPos(); + int distance = Mth.floor(Math.sqrt(distanceSquared(originX, originZ, site))); + source.sendSuccess(() -> Component.literal( + "Nearest Queen spawn in antarchy:thoraxis: [" + + spawn.getX() + ", " + spawn.getY() + ", " + spawn.getZ() + + "] (" + distance + " blocks away)" + ), false); + return distance; + } + + source.sendFailure(Component.literal("No configured Queen spawn was found within the search area.")); + return 0; + } + + private static QueenTrailSpawnMarkerBlockEntity findMarker(ServerLevel level, QueenTrailGrid.Site site) { + BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(site.terminalX(), level.getMinBuildHeight(), site.terminalZ()); + for (int y = level.getMinBuildHeight(); y < level.getMaxBuildHeight(); y++) { + cursor.setY(y); + BlockEntity blockEntity = level.getBlockEntity(cursor); + if (blockEntity instanceof QueenTrailSpawnMarkerBlockEntity marker + && marker.isConfigured() + && marker.getSiteId() == site.id()) { + return marker; + } + } + return null; + } + + private static double distanceSquared(int originX, int originZ, QueenTrailGrid.Site site) { + double dx = site.terminalX() - originX; + double dz = site.terminalZ() - originZ; + return dx * dx + dz * dz; + } +} 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 ecdc752f..590065e0 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 @@ -358,11 +358,11 @@ public final class CreativeTabContents { entry("glowcap_mushroom_block", "natural_blocks"), entry("infested_rooted_dirt", "natural_blocks"), entry("infested_coarse_dirt", "natural_blocks"), - entry("triffid_goo_block", "natural_blocks"), + entry("flytrap_goo_block", "natural_blocks"), entry("bed_bug_egg", "natural_blocks"), - entry("creeping_horror_egg", "natural_blocks"), - entry("lurking_terror_egg", "natural_blocks"), - entry("jumpy_bug_egg", "natural_blocks"), + entry("crawling_blight_egg", "natural_blocks"), + entry("skulking_fright_egg", "natural_blocks"), + entry("springbug_egg", "natural_blocks"), entry("spit_bug_egg", "natural_blocks"), entry("jerry_egg", "natural_blocks"), entry("wasp_nest", "natural_blocks"), @@ -392,6 +392,9 @@ public final class CreativeTabContents { entry("cloud_bucket", "tools_and_utilities"), entry("cheep_bucket", "tools_and_utilities"), entry("lucid_anchor", "tools_and_utilities"), + entry("undertrial_spawner", "tools_and_utilities"), + entry("undervault", "tools_and_utilities"), + entry("undertrial_key", "tools_and_utilities"), entry("reverie_bottle", "tools_and_utilities"), entry("glimmer_bottle", "tools_and_utilities"), entry("critter_cage", "tools_and_utilities"), @@ -463,7 +466,7 @@ public final class CreativeTabContents { entry("fallen_king_crown", "combat"), entry("brutalfly_elytra", "combat"), entry("manticore_wings", "combat"), - entry("jumpy_boots", "combat"), + entry("springy_boots", "combat"), entry("raw_uranium_scrap", "ingredients"), entry("raw_titanium_scrap", "ingredients"), entry("bluestone", "redstone_blocks"), @@ -473,8 +476,8 @@ public final class CreativeTabContents { entry("titanium_nugget", "ingredients"), entry("uranium_ingot", "ingredients"), entry("titanium_ingot", "ingredients"), - entry("cloud_shark_fin", "ingredients"), - entry("cloud_shark_fin_soup", "ingredients"), + entry("stratoshark_fin", "ingredients"), + entry("stratoshark_fin_soup", "ingredients"), entry("basilisk_fang", "ingredients"), entry("nightmare_scale", "ingredients"), entry("molevore_nose", "ingredients"), @@ -497,13 +500,13 @@ public final class CreativeTabContents { entry("brutalfly_wing", "ingredients"), entry("manticore_wing", "ingredients"), entry("primordial_scute", "ingredients"), - entry("triffid_goo", "ingredients"), + entry("flytrap_goo", "ingredients"), entry("vortex_charge", "ingredients"), entry("emperor_scorpion_stinger", "ingredients"), entry("kraken_tooth", "ingredients"), entry("kraken_tentacle", "ingredients"), entry("kraken_kalamari", "ingredients"), - entry("jumpy_bug_leg", "ingredients"), + entry("springbug_leg", "ingredients"), entry("cornea_ear", "ingredients"), entry("corn", "ingredients"), entry("high_fructose_corn_syrup", "ingredients"), @@ -559,17 +562,17 @@ public final class CreativeTabContents { entry("alpha_mantis_spawn_egg", "spawn_eggs"), entry("rolly_polly_spawn_egg", "spawn_eggs"), entry("molevore_spawn_egg", "spawn_eggs"), - entry("triffid_spawn_egg", "spawn_eggs"), + entry("flytrap_spawn_egg", "spawn_eggs"), entry("apple_cow_spawn_egg", "spawn_eggs"), entry("golden_apple_cow_spawn_egg", "spawn_eggs"), entry("enchanted_golden_apple_cow_spawn_egg", "spawn_eggs"), entry("dr_trayaurus_spawn_egg", "spawn_eggs"), entry("wasp_spawn_egg", "spawn_eggs"), entry("bomber_spawn_egg", "spawn_eggs"), - entry("jumpy_bug_spawn_egg", "spawn_eggs"), + entry("springbug_spawn_egg", "spawn_eggs"), entry("spit_bug_spawn_egg", "spawn_eggs"), entry("stink_bug_spawn_egg", "spawn_eggs"), - entry("cloud_shark_spawn_egg", "spawn_eggs"), + entry("stratoshark_spawn_egg", "spawn_eggs"), entry("kraken_spawn_egg", "spawn_eggs"), entry("missile_squid_spawn_egg", "spawn_eggs"), entry("octopus_bomb_spawn_egg", "spawn_eggs"), @@ -581,8 +584,8 @@ public final class CreativeTabContents { entry("basilisk_spawn_egg", "spawn_eggs"), entry("emperor_scorpion_spawn_egg", "spawn_eggs"), entry("toreterror_spawn_egg", "spawn_eggs"), - entry("creeping_horror_spawn_egg", "spawn_eggs"), - entry("lurking_terror_spawn_egg", "spawn_eggs"), + entry("crawling_blight_spawn_egg", "spawn_eggs"), + entry("skulking_fright_spawn_egg", "spawn_eggs"), entry("hercules_beetle_spawn_egg", "spawn_eggs"), entry("jerry_spawn_egg", "spawn_eggs"), entry("dorrie_spawn_egg", "spawn_eggs"), diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageSources.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageSources.java index c9d80c99..bb3d943a 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageSources.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageSources.java @@ -62,20 +62,20 @@ public final class AntarchyDamageSources { ); } - public static DamageSource triffidMauling(ServerLevel level, Entity attacker) { + public static DamageSource flytrapMauling(ServerLevel level, Entity attacker) { return new DamageSource( level.registryAccess() .registryOrThrow(Registries.DAMAGE_TYPE) - .getHolderOrThrow(AntarchyDamageTypes.TRIFFID_MAULING), + .getHolderOrThrow(AntarchyDamageTypes.FLYTRAP_MAULING), attacker ); } - public static DamageSource triffidSwallow(ServerLevel level, Entity attacker) { + public static DamageSource flytrapSwallow(ServerLevel level, Entity attacker) { return new DamageSource( level.registryAccess() .registryOrThrow(Registries.DAMAGE_TYPE) - .getHolderOrThrow(AntarchyDamageTypes.TRIFFID_SWALLOW), + .getHolderOrThrow(AntarchyDamageTypes.FLYTRAP_SWALLOW), attacker ); } @@ -125,11 +125,11 @@ public final class AntarchyDamageSources { ); } - public static DamageSource jumpyBugJump(ServerLevel level, Entity attacker) { + public static DamageSource springbugJump(ServerLevel level, Entity attacker) { return new DamageSource( level.registryAccess() .registryOrThrow(Registries.DAMAGE_TYPE) - .getHolderOrThrow(AntarchyDamageTypes.JUMPY_BUG_JUMP), + .getHolderOrThrow(AntarchyDamageTypes.SPRINGBUG_JUMP), attacker ); } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageTypes.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageTypes.java index d8ac9947..ff7096a4 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageTypes.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/damage/AntarchyDamageTypes.java @@ -43,16 +43,16 @@ public final class AntarchyDamageTypes { ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "emperor_scorpion_sting") ); - public static final ResourceKey TRIFFID_MAULING = + public static final ResourceKey FLYTRAP_MAULING = ResourceKey.create( Registries.DAMAGE_TYPE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "triffid_mauling") + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "flytrap_mauling") ); - public static final ResourceKey TRIFFID_SWALLOW = + public static final ResourceKey FLYTRAP_SWALLOW = ResourceKey.create( Registries.DAMAGE_TYPE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "triffid_swallow") + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "flytrap_swallow") ); public static final ResourceKey CORNEA_STALK_PRICK = @@ -91,10 +91,10 @@ public final class AntarchyDamageTypes { ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "spit_bug_disrespect") ); - public static final ResourceKey JUMPY_BUG_JUMP = + public static final ResourceKey SPRINGBUG_JUMP = ResourceKey.create( Registries.DAMAGE_TYPE, - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "jumpy_bug_jump") + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "springbug_jump") ); public static final ResourceKey HERCULES_BEETLE_OBLITERATION = diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/enchantment/AntarchyEnchantments.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/enchantment/AntarchyEnchantments.java new file mode 100644 index 00000000..7f0f53e0 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/enchantment/AntarchyEnchantments.java @@ -0,0 +1,47 @@ +package com.craisinlord.antarchy.content.enchantment; + +import com.craisinlord.antarchy.Antarchy; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.item.enchantment.ItemEnchantments; + +public final class AntarchyEnchantments { + public static final ResourceKey FEATHER_RISING = key("feather_rising"); + public static final ResourceKey CHRONOSPHERE = key("chronosphere"); + + private AntarchyEnchantments() { + } + + public static int featherRisingLevel(LivingEntity entity) { + return level(entity, EquipmentSlot.FEET, FEATHER_RISING); + } + + public static int chronosphereLevel(LivingEntity entity) { + return level(entity, EquipmentSlot.CHEST, CHRONOSPHERE); + } + + public static int level(LivingEntity entity, EquipmentSlot slot, ResourceKey key) { + var enchantment = entity.level().registryAccess().lookupOrThrow(Registries.ENCHANTMENT).get(key); + return enchantment.map(holder -> EnchantmentHelper.getItemEnchantmentLevel(holder, entity.getItemBySlot(slot))).orElse(0); + } + + public static void ensure(ItemStack stack, HolderLookup.Provider registries, ResourceKey key, int level) { + var enchantment = registries.lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(key); + ItemEnchantments.Mutable enchantments = new ItemEnchantments.Mutable(stack.getEnchantments()); + if (enchantments.getLevel(enchantment) < level) { + enchantments.set(enchantment, level); + EnchantmentHelper.setEnchantments(stack, enchantments.toImmutable().withTooltip(true)); + } + } + + private static ResourceKey key(String path) { + return ResourceKey.create(Registries.ENCHANTMENT, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, path)); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/CreepingHorrorEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/CrawlingBlightEntity.java similarity index 92% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/CreepingHorrorEntity.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/CrawlingBlightEntity.java index 783ad791..68bd01a2 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/CreepingHorrorEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/CrawlingBlightEntity.java @@ -42,9 +42,9 @@ import software.bernie.geckolib.animation.PlayState; import software.bernie.geckolib.animation.RawAnimation; import software.bernie.geckolib.util.GeckoLibUtil; -public class CreepingHorrorEntity extends Monster implements GeoEntity { +public class CrawlingBlightEntity extends Monster implements GeoEntity { private static final EntityDataAccessor CLIMBING = - SynchedEntityData.defineId(CreepingHorrorEntity.class, EntityDataSerializers.BOOLEAN); + SynchedEntityData.defineId(CrawlingBlightEntity.class, EntityDataSerializers.BOOLEAN); private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("idle"); private static final RawAnimation WALK_ANIM = RawAnimation.begin().thenLoop("walk"); @@ -54,7 +54,7 @@ public class CreepingHorrorEntity extends Monster implements GeoEntity { private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); private int attackAnimTicks = 0; - public CreepingHorrorEntity(EntityType type, Level level) { + public CrawlingBlightEntity(EntityType type, Level level) { super(type, level); } @@ -71,19 +71,19 @@ public class CreepingHorrorEntity extends Monster implements GeoEntity { public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes() - .add(Attributes.MAX_HEALTH, AntarchySettings.creepingHorrorHealth()) + .add(Attributes.MAX_HEALTH, AntarchySettings.crawlingBlightHealth()) .add(Attributes.MOVEMENT_SPEED, 0.38D) - .add(Attributes.ATTACK_DAMAGE, AntarchySettings.creepingHorrorAttackDamage()) + .add(Attributes.ATTACK_DAMAGE, AntarchySettings.crawlingBlightAttackDamage()) .add(Attributes.FOLLOW_RANGE, 16.0D); } @Override public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor level, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.MobSpawnType spawnReason, net.minecraft.world.entity.SpawnGroupData spawnData) { - ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.creepingHorrorHealth()); + ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.crawlingBlightHealth()); return super.finalizeSpawn(level, difficulty, spawnReason, spawnData); } - public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { + public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { if (spawnReason == MobSpawnType.SPAWN_EGG || spawnReason == MobSpawnType.SPAWNER || spawnReason == MobSpawnType.COMMAND) { return true; } @@ -133,7 +133,7 @@ public class CreepingHorrorEntity extends Monster implements GeoEntity { .triggerableAnim("attack", ATTACK_ANIM)); } - private PlayState mainAnimController(AnimationState state) { + private PlayState mainAnimController(AnimationState state) { if (attackAnimTicks > 0) { return state.setAndContinue(ATTACK_ANIM); } @@ -152,7 +152,7 @@ public class CreepingHorrorEntity extends Monster implements GeoEntity { public boolean doHurtTarget(net.minecraft.world.entity.Entity target) { boolean result = super.doHurtTarget(target); if (result) { - this.playSound(AntarchySoundEvents.CREEPING_HORROR_BITE.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); + this.playSound(AntarchySoundEvents.CRAWLING_BLIGHT_BITE.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); this.setAttackAnimTicks(20); this.level().broadcastEntityEvent(this, ATTACK_ANIM_EVENT); } @@ -172,17 +172,17 @@ public class CreepingHorrorEntity extends Monster implements GeoEntity { @Override protected SoundEvent getAmbientSound() { - return AntarchySoundEvents.CREEPING_HORROR_GROWL.get(); + return AntarchySoundEvents.CRAWLING_BLIGHT_GROWL.get(); } @Override protected SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource source) { - return AntarchySoundEvents.CREEPING_HORROR_HURT.get(); + return AntarchySoundEvents.CRAWLING_BLIGHT_HURT.get(); } @Override protected SoundEvent getDeathSound() { - return AntarchySoundEvents.CREEPING_HORROR_HURT.get(); + return AntarchySoundEvents.CRAWLING_BLIGHT_HURT.get(); } @Override diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/TriffidEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/FlytrapEntity.java similarity index 92% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/TriffidEntity.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/FlytrapEntity.java index 15ba6bee..29747e1f 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/TriffidEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/FlytrapEntity.java @@ -46,9 +46,9 @@ import software.bernie.geckolib.animation.PlayState; import software.bernie.geckolib.animation.RawAnimation; import software.bernie.geckolib.util.GeckoLibUtil; -public class TriffidEntity extends Monster implements GeoEntity { - private static final EntityDataAccessor ACTION_STATE = SynchedEntityData.defineId(TriffidEntity.class, EntityDataSerializers.INT); - private static final EntityDataAccessor AWAKE = SynchedEntityData.defineId(TriffidEntity.class, EntityDataSerializers.BOOLEAN); +public class FlytrapEntity extends Monster implements GeoEntity { + private static final EntityDataAccessor ACTION_STATE = SynchedEntityData.defineId(FlytrapEntity.class, EntityDataSerializers.INT); + private static final EntityDataAccessor AWAKE = SynchedEntityData.defineId(FlytrapEntity.class, EntityDataSerializers.BOOLEAN); private static final int ACTION_NONE = 0; private static final int ACTION_SWEEP = 1; private static final int ACTION_GRAB = 2; @@ -88,29 +88,29 @@ public class TriffidEntity extends Monster implements GeoEntity { private boolean grabDamageApplied; private int preySearchCooldown = 0; - public TriffidEntity(EntityType entityType, Level level) { + public FlytrapEntity(EntityType entityType, Level level) { super(entityType, level); this.xpReward = 15; } public static AttributeSupplier.Builder createAttributes() { return Monster.createMonsterAttributes() - .add(Attributes.MAX_HEALTH, AntarchySettings.triffidHealth()) - .add(Attributes.ATTACK_DAMAGE, AntarchySettings.triffidAttackDamage()) + .add(Attributes.MAX_HEALTH, AntarchySettings.flytrapHealth()) + .add(Attributes.ATTACK_DAMAGE, AntarchySettings.flytrapAttackDamage()) .add(Attributes.FOLLOW_RANGE, FOLLOW_RANGE) .add(Attributes.KNOCKBACK_RESISTANCE, 1.0D) .add(Attributes.MOVEMENT_SPEED, 0.0D) - .add(Attributes.ARMOR_TOUGHNESS, AntarchySettings.triffidArmorToughness()); + .add(Attributes.ARMOR_TOUGHNESS, AntarchySettings.flytrapArmorToughness()); } @Override public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor level, net.minecraft.world.DifficultyInstance difficulty, MobSpawnType spawnReason, net.minecraft.world.entity.SpawnGroupData spawnData) { - ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.triffidHealth()); + ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.flytrapHealth()); return super.finalizeSpawn(level, difficulty, spawnReason, spawnData); } - public static boolean canSpawn(EntityType entityType, LevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { + public static boolean canSpawn(EntityType entityType, LevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { if (pos.getY() < level.getMinBuildHeight() || pos.getY() + 7 >= level.getMaxBuildHeight()) { return false; } @@ -164,7 +164,7 @@ public class TriffidEntity extends Monster implements GeoEntity { this.goalSelector.addGoal(0, new FloatGoal(this)); this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 16.0F)); this.targetSelector.addGoal(1, new HurtByTargetGoal(this)); - this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, TriffidEntity::isValidPreyTarget)); + this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, FlytrapEntity::isValidPreyTarget)); } @Override @@ -175,7 +175,7 @@ public class TriffidEntity extends Monster implements GeoEntity { .triggerableAnim("death", DEATH_ANIM)); } - private PlayState mainAnimController(AnimationState state) { + private PlayState mainAnimController(AnimationState state) { return switch (this.getActionState()) { case ACTION_SWEEP -> state.setAndContinue(SWEEP_ANIM); case ACTION_GRAB -> state.setAndContinue(GRAB_ANIM); @@ -284,10 +284,10 @@ public class TriffidEntity extends Monster implements GeoEntity { } if (!this.isAwake()) { - return this.random.nextInt(24) == 0 ? AntarchySoundEvents.TRIFFID_HISS.get() : null; + return this.random.nextInt(24) == 0 ? AntarchySoundEvents.FLYTRAP_HISS.get() : null; } - return this.getTarget() != null ? AntarchySoundEvents.TRIFFID_GROWL.get() : null; + return this.getTarget() != null ? AntarchySoundEvents.FLYTRAP_GROWL.get() : null; } @Override @@ -301,12 +301,12 @@ public class TriffidEntity extends Monster implements GeoEntity { @Override protected SoundEvent getHurtSound(DamageSource damageSource) { - return AntarchySoundEvents.TRIFFID_HURT.get(); + return AntarchySoundEvents.FLYTRAP_HURT.get(); } @Override protected SoundEvent getDeathSound() { - return AntarchySoundEvents.TRIFFID_DEATH.get(); + return AntarchySoundEvents.FLYTRAP_DEATH.get(); } @Override @@ -357,7 +357,7 @@ public class TriffidEntity extends Monster implements GeoEntity { this.attackCooldown = SWEEP_COOLDOWN_TICKS; this.actionStartYaw = this.getAngleTo(target) - 100.0F; this.setYRot(this.actionStartYaw); - this.playSound(AntarchySoundEvents.TRIFFID_ATTACK.get(), 0.9F, 0.75F); + this.playSound(AntarchySoundEvents.FLYTRAP_ATTACK.get(), 0.9F, 0.75F); } private void tickSweepAttack() { @@ -392,7 +392,7 @@ public class TriffidEntity extends Monster implements GeoEntity { List candidates = this.level().getEntitiesOfClass( LivingEntity.class, this.getBoundingBox().inflate(SWEEP_RANGE, 1.0D, SWEEP_RANGE), - TriffidEntity::isValidLivePrey + FlytrapEntity::isValidLivePrey ); for (LivingEntity candidate : candidates) { @@ -412,8 +412,8 @@ public class TriffidEntity extends Monster implements GeoEntity { // shield or armor effect can absorb the damage and make hurt() return false without // granting the vanilla invulnerability window, which would otherwise let this attack // re-attempt damage on the same entity every single tick of the active window. - this.sweepHitCooldowns.put(candidate.getUUID(), AntarchySettings.triffidSweepHitCooldownTicks()); - candidate.hurt(AntarchyDamageSources.triffidMauling(serverLevel, this), (float) AntarchySettings.triffidAttackDamage()); + this.sweepHitCooldowns.put(candidate.getUUID(), AntarchySettings.flytrapSweepHitCooldownTicks()); + candidate.hurt(AntarchyDamageSources.flytrapMauling(serverLevel, this), (float) AntarchySettings.flytrapAttackDamage()); } } @@ -424,7 +424,7 @@ public class TriffidEntity extends Monster implements GeoEntity { this.grabTargetId = target.getId(); this.grabDamageApplied = false; this.setYRot(this.getAngleTo(target)); - this.playSound(AntarchySoundEvents.TRIFFID_GRAB.get(), 0.8F, 0.85F); + this.playSound(AntarchySoundEvents.FLYTRAP_GRAB.get(), 0.8F, 0.85F); } private void tickGrabAttack() { @@ -443,9 +443,9 @@ public class TriffidEntity extends Monster implements GeoEntity { if (!this.grabDamageApplied && elapsed >= GRAB_DAMAGE_TICK) { this.grabDamageApplied = true; if (this.level() instanceof ServerLevel serverLevel) { - grabTarget.hurt(AntarchyDamageSources.triffidSwallow(serverLevel, this), (float) AntarchySettings.triffidGrabDamage()); + grabTarget.hurt(AntarchyDamageSources.flytrapSwallow(serverLevel, this), (float) AntarchySettings.flytrapGrabDamage()); } else { - grabTarget.hurt(this.damageSources().mobAttack(this), (float) AntarchySettings.triffidGrabDamage()); + grabTarget.hurt(this.damageSources().mobAttack(this), (float) AntarchySettings.flytrapGrabDamage()); } } @@ -496,7 +496,7 @@ public class TriffidEntity extends Monster implements GeoEntity { return !this.level().getEntitiesOfClass( LivingEntity.class, this.getBoundingBox().inflate(WAKE_RANGE, 4.0D, WAKE_RANGE), - TriffidEntity::isValidLivePrey + FlytrapEntity::isValidLivePrey ).isEmpty(); } @@ -505,7 +505,7 @@ public class TriffidEntity extends Monster implements GeoEntity { List candidates = this.level().getEntitiesOfClass( LivingEntity.class, this.getBoundingBox().inflate(FOLLOW_RANGE, 6.0D, FOLLOW_RANGE), - TriffidEntity::isValidLivePrey + FlytrapEntity::isValidLivePrey ); LivingEntity best = null; double bestDistance = Double.MAX_VALUE; @@ -527,15 +527,15 @@ public class TriffidEntity extends Monster implements GeoEntity { private void syncConfiguredAttributes() { if (this.getAttribute(Attributes.MAX_HEALTH) != null) { - this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(AntarchySettings.triffidHealth()); + this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(AntarchySettings.flytrapHealth()); } if (this.getAttribute(Attributes.ATTACK_DAMAGE) != null) { - this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(AntarchySettings.triffidAttackDamage()); + this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(AntarchySettings.flytrapAttackDamage()); } } private static boolean isLowHealthPrey(LivingEntity target) { - return target.getHealth() <= Math.max((float) AntarchySettings.triffidGrabDamage(), target.getMaxHealth() * 0.35F); + return target.getHealth() <= Math.max((float) AntarchySettings.flytrapGrabDamage(), target.getMaxHealth() * 0.35F); } private int getActionState() { @@ -573,6 +573,6 @@ public class TriffidEntity extends Monster implements GeoEntity { if (target instanceof Player player) { return !player.isCreative() && !player.isSpectator(); } - return target.getType().is(AntarchyTags.Entities.TRIFFID_PREY); + return target.getType().is(AntarchyTags.Entities.FLYTRAP_PREY); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/LurkingTerrorEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/SkulkingFrightEntity.java similarity index 89% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/LurkingTerrorEntity.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/SkulkingFrightEntity.java index 9037d8a3..af9a17c0 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/LurkingTerrorEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/SkulkingFrightEntity.java @@ -37,7 +37,7 @@ import software.bernie.geckolib.animation.PlayState; import software.bernie.geckolib.animation.RawAnimation; import software.bernie.geckolib.util.GeckoLibUtil; -public class LurkingTerrorEntity extends Monster implements GeoEntity { +public class SkulkingFrightEntity extends Monster implements GeoEntity { private static final RawAnimation IDLE_ANIM = RawAnimation.begin().thenLoop("idle"); private static final RawAnimation WALK_ANIM = RawAnimation.begin().thenLoop("walk"); private static final RawAnimation FLY_ANIM = RawAnimation.begin().thenLoop("fly"); @@ -48,16 +48,16 @@ public class LurkingTerrorEntity extends Monster implements GeoEntity { private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); private int attackAnimTicks = 0; - public LurkingTerrorEntity(EntityType type, Level level) { + public SkulkingFrightEntity(EntityType type, Level level) { super(type, level); this.moveControl = new FlyingMoveControl(this, 10, true); } public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes() - .add(Attributes.MAX_HEALTH, AntarchySettings.lurkingTerrorHealth()) + .add(Attributes.MAX_HEALTH, AntarchySettings.skulkingFrightHealth()) .add(Attributes.MOVEMENT_SPEED, 0.35D) - .add(Attributes.ATTACK_DAMAGE, AntarchySettings.lurkingTerrorAttackDamage()) + .add(Attributes.ATTACK_DAMAGE, AntarchySettings.skulkingFrightAttackDamage()) .add(Attributes.FOLLOW_RANGE, 16.0D) .add(Attributes.FLYING_SPEED, 0.55D); } @@ -65,11 +65,11 @@ public class LurkingTerrorEntity extends Monster implements GeoEntity { @Override public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(ServerLevelAccessor level, net.minecraft.world.DifficultyInstance difficulty, MobSpawnType spawnReason, net.minecraft.world.entity.SpawnGroupData spawnData) { - ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.lurkingTerrorHealth()); + ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.skulkingFrightHealth()); return super.finalizeSpawn(level, difficulty, spawnReason, spawnData); } - public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { + public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { if (spawnReason == MobSpawnType.SPAWN_EGG || spawnReason == MobSpawnType.SPAWNER || spawnReason == MobSpawnType.COMMAND) { return true; } @@ -120,7 +120,7 @@ public class LurkingTerrorEntity extends Monster implements GeoEntity { .triggerableAnim("attackair", ATTACK_AIR_ANIM)); } - private PlayState mainAnimController(AnimationState state) { + private PlayState mainAnimController(AnimationState state) { if (attackAnimTicks > 0) { if (!this.onGround()) { return state.setAndContinue(ATTACK_AIR_ANIM); @@ -145,7 +145,7 @@ public class LurkingTerrorEntity extends Monster implements GeoEntity { public boolean doHurtTarget(net.minecraft.world.entity.Entity target) { boolean result = super.doHurtTarget(target); if (result) { - this.playSound(AntarchySoundEvents.LURKING_TERROR_BITE.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); + this.playSound(AntarchySoundEvents.SKULKING_FRIGHT_BITE.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); this.setAttackAnimTicks(20); this.level().broadcastEntityEvent(this, ATTACK_ANIM_EVENT); } @@ -154,17 +154,17 @@ public class LurkingTerrorEntity extends Monster implements GeoEntity { @Override protected SoundEvent getAmbientSound() { - return AntarchySoundEvents.LURKING_TERROR_SNARL.get(); + return AntarchySoundEvents.SKULKING_FRIGHT_SNARL.get(); } @Override protected SoundEvent getHurtSound(net.minecraft.world.damagesource.DamageSource source) { - return AntarchySoundEvents.LURKING_TERROR_HURT.get(); + return AntarchySoundEvents.SKULKING_FRIGHT_HURT.get(); } @Override protected SoundEvent getDeathSound() { - return AntarchySoundEvents.LURKING_TERROR_HURT.get(); + return AntarchySoundEvents.SKULKING_FRIGHT_HURT.get(); } @Override @@ -182,7 +182,7 @@ public class LurkingTerrorEntity extends Monster implements GeoEntity { super.tick(); CavarynBurrowingMobBehavior.moveOutOfBlocks(this); if (!this.level().isClientSide() && !this.onGround() && this.tickCount % 80 == 0) { - this.playSound(AntarchySoundEvents.LURKING_TERROR_FLY_LOOP.get(), 0.45F, 0.95F + this.random.nextFloat() * 0.1F); + this.playSound(AntarchySoundEvents.SKULKING_FRIGHT_FLY_LOOP.get(), 0.45F, 0.95F + this.random.nextFloat() * 0.1F); } if (attackAnimTicks > 0) this.setAttackAnimTicks(attackAnimTicks - 1); } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/JumpyBugEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/SpringbugEntity.java similarity index 80% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/JumpyBugEntity.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/SpringbugEntity.java index b2a3f39c..c8ecd317 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/JumpyBugEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/SpringbugEntity.java @@ -61,13 +61,13 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.EnumSet; import java.util.function.IntFunction; -public class JumpyBugEntity extends Monster implements GeoEntity { +public class SpringbugEntity extends Monster implements GeoEntity { private static final EntityDataAccessor CAMOUFLAGED = - SynchedEntityData.defineId(JumpyBugEntity.class, EntityDataSerializers.BOOLEAN); + SynchedEntityData.defineId(SpringbugEntity.class, EntityDataSerializers.BOOLEAN); private static final EntityDataAccessor CLINGING_TO_CEILING = - SynchedEntityData.defineId(JumpyBugEntity.class, EntityDataSerializers.BOOLEAN); + SynchedEntityData.defineId(SpringbugEntity.class, EntityDataSerializers.BOOLEAN); private static final EntityDataAccessor ATTACK_STATE = - SynchedEntityData.defineId(JumpyBugEntity.class, EntityDataSerializers.INT); + SynchedEntityData.defineId(SpringbugEntity.class, EntityDataSerializers.INT); private static final String POUNCE_COOLDOWN_KEY = "PounceCooldown"; private static final String RECOVERY_TICKS_KEY = "RecoveryTicks"; @@ -121,20 +121,20 @@ public class JumpyBugEntity extends Monster implements GeoEntity { private float visualAlpha = 1.0F; private float previousVisualAlpha = 1.0F; - public JumpyBugEntity(EntityType entityType, Level level) { + public SpringbugEntity(EntityType entityType, Level level) { super(entityType, level); this.xpReward = 6; } public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes() - .add(Attributes.MAX_HEALTH, AntarchySettings.jumpyBugHealth()) - .add(Attributes.ATTACK_DAMAGE, AntarchySettings.jumpyBugPounceDamage()) + .add(Attributes.MAX_HEALTH, AntarchySettings.springbugHealth()) + .add(Attributes.ATTACK_DAMAGE, AntarchySettings.springbugPounceDamage()) .add(Attributes.MOVEMENT_SPEED, DEFAULT_MOVEMENT_SPEED) .add(Attributes.FOLLOW_RANGE, DEFAULT_FOLLOW_RANGE); } - public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { + public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { if (spawnReason == MobSpawnType.SPAWN_EGG || spawnReason == MobSpawnType.SPAWNER || spawnReason == MobSpawnType.COMMAND) { return true; } @@ -200,9 +200,9 @@ public class JumpyBugEntity extends Monster implements GeoEntity { public SpawnGroupData finalizeSpawn(ServerLevelAccessor level, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData spawnGroupData) { AttributeInstance maxHealthAttribute = this.getAttribute(Attributes.MAX_HEALTH); if (maxHealthAttribute != null) { - maxHealthAttribute.setBaseValue(AntarchySettings.jumpyBugHealth()); + maxHealthAttribute.setBaseValue(AntarchySettings.springbugHealth()); } - this.setHealth((float) AntarchySettings.jumpyBugHealth()); + this.setHealth((float) AntarchySettings.springbugHealth()); return super.finalizeSpawn(level, difficulty, spawnReason, spawnGroupData); } @@ -298,23 +298,23 @@ public class JumpyBugEntity extends Monster implements GeoEntity { @Override public boolean doHurtTarget(Entity target) { return target instanceof LivingEntity livingTarget && this.level() instanceof ServerLevel serverLevel - ? livingTarget.hurt(AntarchyDamageSources.jumpyBugJump(serverLevel, this), (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE)) + ? livingTarget.hurt(AntarchyDamageSources.springbugJump(serverLevel, this), (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE)) : super.doHurtTarget(target); } @Override protected SoundEvent getAmbientSound() { - return AntarchySoundEvents.JUMPY_BUG_IDLE.get(); + return AntarchySoundEvents.SPRINGBUG_IDLE.get(); } @Override protected SoundEvent getHurtSound(DamageSource damageSource) { - return AntarchySoundEvents.JUMPY_BUG_HURT.get(); + return AntarchySoundEvents.SPRINGBUG_HURT.get(); } @Override protected SoundEvent getDeathSound() { - return AntarchySoundEvents.JUMPY_BUG_HURT.get(); + return AntarchySoundEvents.SPRINGBUG_HURT.get(); } @Override @@ -381,10 +381,10 @@ public class JumpyBugEntity extends Monster implements GeoEntity { } private float getTargetVisualAlpha() { - return this.isCamouflaged() ? (float) AntarchySettings.jumpyBugCamouflageAlpha() : 1.0F; + return this.isCamouflaged() ? (float) AntarchySettings.springbugCamouflageAlpha() : 1.0F; } - private PlayState mainAnimController(AnimationState state) { + private PlayState mainAnimController(AnimationState state) { AttackState attackState = this.getAttackState(); if (attackState == AttackState.CLINGING) { return state.setAndContinue(HANGING_ANIM); @@ -424,9 +424,9 @@ public class JumpyBugEntity extends Monster implements GeoEntity { LivingEntity target = this.getTarget(); if (target != null && target.isAlive() && this.distanceToSqr(target) <= POUNCE_LAND_DAMAGE_RANGE * POUNCE_LAND_DAMAGE_RANGE) { if (this.level() instanceof ServerLevel serverLevel) { - target.hurt(AntarchyDamageSources.jumpyBugJump(serverLevel, this), (float) AntarchySettings.jumpyBugPounceDamage()); + target.hurt(AntarchyDamageSources.springbugJump(serverLevel, this), (float) AntarchySettings.springbugPounceDamage()); } else { - target.hurt(this.damageSources().mobAttack(this), (float) AntarchySettings.jumpyBugPounceDamage()); + target.hurt(this.damageSources().mobAttack(this), (float) AntarchySettings.springbugPounceDamage()); } } this.finishPounce(false); @@ -604,7 +604,7 @@ public class JumpyBugEntity extends Monster implements GeoEntity { Mth.clamp(localDelta.z * 0.18D, -0.35D, 0.35D) )); this.hasImpulse = true; - this.playSound(AntarchySoundEvents.JUMPY_BUG_JUMP.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); + this.playSound(AntarchySoundEvents.SPRINGBUG_JUMP.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); } private void cancelLeap() { @@ -629,7 +629,7 @@ public class JumpyBugEntity extends Monster implements GeoEntity { double upward = POUNCE_UPWARD_SPEED + Mth.clamp(to.y * 0.08D, -0.04D, 0.22D); this.setDeltaMovement(this.toWorld(direction.x * POUNCE_HORIZONTAL_SPEED, upward, direction.z * POUNCE_HORIZONTAL_SPEED)); this.hasImpulse = true; - this.playSound(AntarchySoundEvents.JUMPY_BUG_JUMP.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); + this.playSound(AntarchySoundEvents.SPRINGBUG_JUMP.get(), 1.0F, 0.95F + this.random.nextFloat() * 0.1F); } private void beginCeilingDrop(LivingEntity target) { @@ -647,7 +647,7 @@ public class JumpyBugEntity extends Monster implements GeoEntity { Vec3 direction = horizontal.lengthSqr() > 1.0E-4D ? horizontal.normalize() : this.toLocalPlane(target.getLookAngle()).normalize(); this.setDeltaMovement(this.toWorld(direction.x * CEILING_DROP_HORIZONTAL_SPEED, CEILING_DROP_UPWARD_SPEED, direction.z * CEILING_DROP_HORIZONTAL_SPEED)); this.hasImpulse = true; - this.playSound(AntarchySoundEvents.JUMPY_BUG_JUMP.get(), 1.0F, 0.9F + this.random.nextFloat() * 0.1F); + this.playSound(AntarchySoundEvents.SPRINGBUG_JUMP.get(), 1.0F, 0.9F + this.random.nextFloat() * 0.1F); } private void finishPounce(boolean keepMomentum) { @@ -706,24 +706,24 @@ public class JumpyBugEntity extends Monster implements GeoEntity { @Override public boolean canUse() { - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); return target != null && target.isAlive() - && !JumpyBugEntity.this.isPouncing() - && !JumpyBugEntity.this.isLeapingToCeiling() - && !JumpyBugEntity.this.isClingingToCeiling() - && JumpyBugEntity.this.distanceToSqr(target) <= MELEE_RANGE_SQR; + && !SpringbugEntity.this.isPouncing() + && !SpringbugEntity.this.isLeapingToCeiling() + && !SpringbugEntity.this.isClingingToCeiling() + && SpringbugEntity.this.distanceToSqr(target) <= MELEE_RANGE_SQR; } @Override public boolean canContinueToUse() { - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); return target != null && target.isAlive() - && !JumpyBugEntity.this.isPouncing() - && !JumpyBugEntity.this.isLeapingToCeiling() - && !JumpyBugEntity.this.isClingingToCeiling() - && JumpyBugEntity.this.distanceToSqr(target) <= CONTINUE_RANGE_SQR; + && !SpringbugEntity.this.isPouncing() + && !SpringbugEntity.this.isLeapingToCeiling() + && !SpringbugEntity.this.isClingingToCeiling() + && SpringbugEntity.this.distanceToSqr(target) <= CONTINUE_RANGE_SQR; } @Override @@ -733,17 +733,17 @@ public class JumpyBugEntity extends Monster implements GeoEntity { @Override public void tick() { - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); if (target == null) return; - JumpyBugEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); - JumpyBugEntity.this.getNavigation().moveTo(target, 1.1D); + SpringbugEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); + SpringbugEntity.this.getNavigation().moveTo(target, 1.1D); if (this.attackCooldown > 0) { this.attackCooldown--; } - if (this.attackCooldown <= 0 && JumpyBugEntity.this.distanceToSqr(target) <= MELEE_RANGE_SQR) { - JumpyBugEntity.this.doHurtTarget(target); + if (this.attackCooldown <= 0 && SpringbugEntity.this.distanceToSqr(target) <= MELEE_RANGE_SQR) { + SpringbugEntity.this.doHurtTarget(target); this.attackCooldown = ATTACK_COOLDOWN; } } @@ -756,25 +756,25 @@ public class JumpyBugEntity extends Monster implements GeoEntity { @Override public boolean canUse() { - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); return target != null && target.isAlive() - && JumpyBugEntity.this.canUseAmbush() - && JumpyBugEntity.this.pounceCooldownTicks <= 0 - && JumpyBugEntity.this.preferPounceThisWindow - && (JumpyBugEntity.this.hasLineOfSight(target) || JumpyBugEntity.this.distanceToSqr(target) <= 9.0D); + && SpringbugEntity.this.canUseAmbush() + && SpringbugEntity.this.pounceCooldownTicks <= 0 + && SpringbugEntity.this.preferPounceThisWindow + && (SpringbugEntity.this.hasLineOfSight(target) || SpringbugEntity.this.distanceToSqr(target) <= 9.0D); } @Override public boolean canContinueToUse() { - return JumpyBugEntity.this.isPouncing(); + return SpringbugEntity.this.isPouncing(); } @Override public void start() { - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); if (target != null) { - JumpyBugEntity.this.beginPounce(target); + SpringbugEntity.this.beginPounce(target); } } } @@ -789,91 +789,91 @@ public class JumpyBugEntity extends Monster implements GeoEntity { @Override public boolean canUse() { - if (!JumpyBugEntity.this.canUseAmbush() || JumpyBugEntity.this.isClingingToCeiling()) { + if (!SpringbugEntity.this.canUseAmbush() || SpringbugEntity.this.isClingingToCeiling()) { return false; } - if (JumpyBugEntity.this.ceilingSearchCooldownTicks > 0) { + if (SpringbugEntity.this.ceilingSearchCooldownTicks > 0) { return false; } - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); boolean targetFarAway = target != null - && JumpyBugEntity.this.distanceToSqr(target) > 12.0D * 12.0D; + && SpringbugEntity.this.distanceToSqr(target) > 12.0D * 12.0D; boolean noTarget = target == null; if (!noTarget && !targetFarAway) { return false; } - if (JumpyBugEntity.this.random.nextInt(noTarget ? 8 : 14) != 0) { + if (SpringbugEntity.this.random.nextInt(noTarget ? 8 : 14) != 0) { return false; } - this.targetCeiling = JumpyBugEntity.this.findCeilingForLeap(); - JumpyBugEntity.this.ceilingSearchCooldownTicks = CEILING_SEARCH_COOLDOWN; + this.targetCeiling = SpringbugEntity.this.findCeilingForLeap(); + SpringbugEntity.this.ceilingSearchCooldownTicks = CEILING_SEARCH_COOLDOWN; return this.targetCeiling != null; } @Override public boolean canContinueToUse() { - if (JumpyBugEntity.this.isClingingToCeiling() || JumpyBugEntity.this.isLeapingToCeiling()) { + if (SpringbugEntity.this.isClingingToCeiling() || SpringbugEntity.this.isLeapingToCeiling()) { return true; } - LivingEntity target = JumpyBugEntity.this.getTarget(); - boolean allowedTarget = target == null || JumpyBugEntity.this.distanceToSqr(target) > CEILING_AMBUSH_RANGE_SQR; + LivingEntity target = SpringbugEntity.this.getTarget(); + boolean allowedTarget = target == null || SpringbugEntity.this.distanceToSqr(target) > CEILING_AMBUSH_RANGE_SQR; return this.targetCeiling != null && allowedTarget - && JumpyBugEntity.this.canUseAmbush(); + && SpringbugEntity.this.canUseAmbush(); } @Override public void start() { if (this.targetCeiling != null) { BlockPos ceiling = this.targetCeiling; - if (JumpyBugEntity.this.isAlignedBelowCeiling(ceiling) && ceiling.getY() - JumpyBugEntity.this.getY() <= JumpyBugEntity.this.directCeilingSearchHeight()) { - JumpyBugEntity.this.beginClinging(); + if (SpringbugEntity.this.isAlignedBelowCeiling(ceiling) && ceiling.getY() - SpringbugEntity.this.getY() <= SpringbugEntity.this.directCeilingSearchHeight()) { + SpringbugEntity.this.beginClinging(); } } } @Override public void stop() { - if (JumpyBugEntity.this.isClingingToCeiling()) { - JumpyBugEntity.this.stopClinging(); - } else if (JumpyBugEntity.this.isLeapingToCeiling()) { - JumpyBugEntity.this.cancelLeap(); + if (SpringbugEntity.this.isClingingToCeiling()) { + SpringbugEntity.this.stopClinging(); + } else if (SpringbugEntity.this.isLeapingToCeiling()) { + SpringbugEntity.this.cancelLeap(); } this.targetCeiling = null; } @Override public void tick() { - if (JumpyBugEntity.this.isClingingToCeiling()) { - LivingEntity target = JumpyBugEntity.this.getTarget(); + if (SpringbugEntity.this.isClingingToCeiling()) { + LivingEntity target = SpringbugEntity.this.getTarget(); if (target != null) { - JumpyBugEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); - if (JumpyBugEntity.this.pounceCooldownTicks <= 0 - && JumpyBugEntity.this.distanceToSqr(target) <= CEILING_TRIGGER_RANGE_SQR - && JumpyBugEntity.this.hasLineOfSight(target)) { - JumpyBugEntity.this.beginCeilingDrop(target); + SpringbugEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); + if (SpringbugEntity.this.pounceCooldownTicks <= 0 + && SpringbugEntity.this.distanceToSqr(target) <= CEILING_TRIGGER_RANGE_SQR + && SpringbugEntity.this.hasLineOfSight(target)) { + SpringbugEntity.this.beginCeilingDrop(target); } } return; } - if (JumpyBugEntity.this.isLeapingToCeiling() || this.targetCeiling == null) { + if (SpringbugEntity.this.isLeapingToCeiling() || this.targetCeiling == null) { return; } BlockPos ceiling = this.targetCeiling; - JumpyBugEntity.this.getLookControl().setLookAt(ceiling.getX() + 0.5D, ceiling.getY() - 1.0D, ceiling.getZ() + 0.5D, 20.0F, 20.0F); - if (!JumpyBugEntity.this.isUsableCeiling(ceiling)) { + SpringbugEntity.this.getLookControl().setLookAt(ceiling.getX() + 0.5D, ceiling.getY() - 1.0D, ceiling.getZ() + 0.5D, 20.0F, 20.0F); + if (!SpringbugEntity.this.isUsableCeiling(ceiling)) { this.targetCeiling = null; return; } - if (JumpyBugEntity.this.isAlignedBelowCeiling(ceiling)) { - if (JumpyBugEntity.this.onGround()) { - JumpyBugEntity.this.beginLeapToCeiling(ceiling); + if (SpringbugEntity.this.isAlignedBelowCeiling(ceiling)) { + if (SpringbugEntity.this.onGround()) { + SpringbugEntity.this.beginLeapToCeiling(ceiling); } } else { - JumpyBugEntity.this.getNavigation().moveTo(ceiling.getX() + 0.5D, JumpyBugEntity.this.getY(), ceiling.getZ() + 0.5D, 1.05D); + SpringbugEntity.this.getNavigation().moveTo(ceiling.getX() + 0.5D, SpringbugEntity.this.getY(), ceiling.getZ() + 0.5D, 1.05D); } } } @@ -885,13 +885,13 @@ public class JumpyBugEntity extends Monster implements GeoEntity { @Override public boolean canUse() { - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); return target != null && target.isAlive() - && !JumpyBugEntity.this.isClingingToCeiling() - && !JumpyBugEntity.this.isPouncing() - && !JumpyBugEntity.this.isLeapingToCeiling() - && JumpyBugEntity.this.recoveryTicks <= 0; + && !SpringbugEntity.this.isClingingToCeiling() + && !SpringbugEntity.this.isPouncing() + && !SpringbugEntity.this.isLeapingToCeiling() + && SpringbugEntity.this.recoveryTicks <= 0; } @Override @@ -901,53 +901,53 @@ public class JumpyBugEntity extends Monster implements GeoEntity { @Override public void tick() { - LivingEntity target = JumpyBugEntity.this.getTarget(); + LivingEntity target = SpringbugEntity.this.getTarget(); if (target == null) { return; } - JumpyBugEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); - double distSqr = JumpyBugEntity.this.distanceToSqr(target); + SpringbugEntity.this.getLookControl().setLookAt(target, 30.0F, 30.0F); + double distSqr = SpringbugEntity.this.distanceToSqr(target); if (distSqr <= MELEE_WALK_RANGE * MELEE_WALK_RANGE) { - JumpyBugEntity.this.getNavigation().moveTo(target, 1.05D); + SpringbugEntity.this.getNavigation().moveTo(target, 1.05D); } else if (distSqr > CHASE_LEAP_RANGE_SQR) { - if (JumpyBugEntity.this.onGround() && JumpyBugEntity.this.chaseJumpCooldownTicks <= 0) { - Vec3 dir = JumpyBugEntity.this.toLocalPlane(target.position().subtract(JumpyBugEntity.this.position())).normalize(); - JumpyBugEntity.this.setDeltaMovement(JumpyBugEntity.this.toWorld( + if (SpringbugEntity.this.onGround() && SpringbugEntity.this.chaseJumpCooldownTicks <= 0) { + Vec3 dir = SpringbugEntity.this.toLocalPlane(target.position().subtract(SpringbugEntity.this.position())).normalize(); + SpringbugEntity.this.setDeltaMovement(SpringbugEntity.this.toWorld( dir.x * CHASE_LEAP_HORIZONTAL, CHASE_LEAP_VERTICAL, dir.z * CHASE_LEAP_HORIZONTAL )); - JumpyBugEntity.this.hasImpulse = true; - JumpyBugEntity.this.chaseJumpCooldownTicks = CHASE_JUMP_COOLDOWN; + SpringbugEntity.this.hasImpulse = true; + SpringbugEntity.this.chaseJumpCooldownTicks = CHASE_JUMP_COOLDOWN; } - JumpyBugEntity.this.getNavigation().stop(); + SpringbugEntity.this.getNavigation().stop(); } else { - JumpyBugEntity.this.getNavigation().moveTo(target, 1.05D); + SpringbugEntity.this.getNavigation().moveTo(target, 1.05D); } } } private final class WanderGoal extends RandomStrollGoal { private WanderGoal() { - super(JumpyBugEntity.this, 0.8D); + super(SpringbugEntity.this, 0.8D); } @Override public boolean canUse() { - return !JumpyBugEntity.this.isClingingToCeiling() - && !JumpyBugEntity.this.isPouncing() - && !JumpyBugEntity.this.isLeapingToCeiling() - && JumpyBugEntity.this.getTarget() == null + return !SpringbugEntity.this.isClingingToCeiling() + && !SpringbugEntity.this.isPouncing() + && !SpringbugEntity.this.isLeapingToCeiling() + && SpringbugEntity.this.getTarget() == null && super.canUse(); } @Override public boolean canContinueToUse() { - return !JumpyBugEntity.this.isClingingToCeiling() - && !JumpyBugEntity.this.isPouncing() - && !JumpyBugEntity.this.isLeapingToCeiling() + return !SpringbugEntity.this.isClingingToCeiling() + && !SpringbugEntity.this.isPouncing() + && !SpringbugEntity.this.isLeapingToCeiling() && super.canContinueToUse(); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/lucid/LucidEyeProjectileEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/lucid/LucidEyeProjectileEntity.java index 6625ddf5..67fa7715 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/lucid/LucidEyeProjectileEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/lucid/LucidEyeProjectileEntity.java @@ -35,7 +35,9 @@ public class LucidEyeProjectileEntity extends ThrowableItemProjectile { @Override protected double getDefaultGravity() { - return -0.03; + // Gravity is expressed in the projectile's local frame, so the generic + // Underside hook mirrors this pearl's special rising arc below Y=0. + return -0.03D; } @Override diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/portal/DimensionalTearEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/portal/DimensionalTearEntity.java index d3b57614..fb4a2eb7 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/portal/DimensionalTearEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/portal/DimensionalTearEntity.java @@ -15,6 +15,7 @@ import java.util.Set; import java.util.UUID; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance; +import net.minecraft.client.sounds.SoundManager; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; @@ -78,7 +79,8 @@ public class DimensionalTearEntity extends Entity implements GeoEntity { private static final Map> QUEEN_TEAR_IDS = new HashMap<>(); private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); - private boolean idleSoundStarted; + @Nullable + private TearIdleSoundInstance idleSound; private UUID linkedTearId; @Nullable private DimensionalTearEntity linkedTear; @@ -453,11 +455,15 @@ public class DimensionalTearEntity extends Entity implements GeoEntity { } private void tickIdleSound() { - if (this.idleSoundStarted || this.getTearState() == TearState.OPENING) { + SoundManager soundManager = Minecraft.getInstance().getSoundManager(); + if (this.getTearState() == TearState.OPENING) { return; } - this.idleSoundStarted = true; - Minecraft.getInstance().getSoundManager().play(new TearIdleSoundInstance(this)); + if (this.idleSound != null && soundManager.isActive(this.idleSound)) { + return; + } + this.idleSound = new TearIdleSoundInstance(this); + soundManager.play(this.idleSound); } private void tickClientParticles() { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/KingEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/KingEntity.java index de5059a5..f01428c6 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/KingEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/KingEntity.java @@ -15,6 +15,7 @@ import net.minecraft.network.protocol.game.ClientboundClearTitlesPacket; import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket; import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket; import net.minecraft.network.protocol.game.ClientboundSetTitlesAnimationPacket; +import net.minecraft.nbt.CompoundTag; import net.minecraft.world.BossEvent; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffectInstance; @@ -86,9 +87,21 @@ public class KingEntity extends RoyalBossEntity { private static final double CHAIN_LIGHTNING_JUMP_RANGE = 9.0D; private static final int ICE_FREEZE_PER_TICK = 7; private static final int BEHAVIOR_SCORE_CAP = 12; + /** Keep the tree-bound patrol safely inside the authored tree footprint. */ + private static final double TREE_ORBIT_RADIUS = 128.0D; + private static final double TREE_ORBIT_ANGLE_STEP = 0.014D; + private static final int TREE_ORBIT_PATH_SAMPLES = 16; @Nullable private Vec3 patrolCenter; + @Nullable + private Vec3 treePatrolCenter; + @Nullable + private Vec3 treePatrolWaypoint; + private double treePatrolMinimumY; + private double treePatrolMaximumY; + private double treePatrolAngle; + private boolean treePatrolBound; private int patrolCooldownTicks; private int decreeCooldownTicks; private int activeDecreeTicks; @@ -133,6 +146,25 @@ public class KingEntity extends RoyalBossEntity { return createBaseAttributes(AntarchySettings.kingHealth(), AntarchySettings.kingAttackDamage()); } + public void setTreePatrolHome(Vec3 center, double minimumY, double maximumY, double angle) { + this.treePatrolCenter = center; + this.treePatrolMinimumY = minimumY; + this.treePatrolMaximumY = maximumY; + this.treePatrolAngle = angle; + this.treePatrolWaypoint = null; + this.treePatrolBound = true; + } + + public boolean isTreePatrolFor(Vec3 center) { + return this.treePatrolBound && this.treePatrolCenter != null + && this.treePatrolCenter.distanceToSqr(center) < 1.0D; + } + + @Override + protected boolean shouldClearObstruction() { + return this.getTarget() != null; + } + @Override protected String geoName() { return "king"; @@ -351,6 +383,10 @@ public class KingEntity extends RoyalBossEntity { } this.setRoyalFlying(true); this.decreeRetreatPressure = false; + if (this.treePatrolBound && this.treePatrolCenter != null) { + this.tickTreePatrol(); + return; + } if (this.patrolCenter == null || this.position().distanceToSqr(this.patrolCenter) > 64.0D * 64.0D) { this.patrolCenter = this.position(); } @@ -366,6 +402,58 @@ public class KingEntity extends RoyalBossEntity { } } + private void tickTreePatrol() { + Vec3 center = this.treePatrolCenter; + if (center == null) { + return; + } + this.treePatrolAngle += TREE_ORBIT_ANGLE_STEP; + if (this.treePatrolAngle >= Math.PI * 2.0D) { + this.treePatrolAngle -= Math.PI * 2.0D; + } + Vec3 waypoint = this.treePatrolWaypoint; + if (waypoint == null || this.position().distanceToSqr(waypoint) < 36.0D) { + waypoint = this.findTreePatrolWaypoint(center, this.treePatrolAngle); + this.treePatrolWaypoint = waypoint; + } + if (waypoint != null) { + this.getMoveControl().setWantedPosition(waypoint.x, waypoint.y, waypoint.z, 1.0D); + this.getLookControl().setLookAt(center.x, + (this.treePatrolMinimumY + this.treePatrolMaximumY) * 0.5D, + center.z, 30.0F, 30.0F); + } + } + + @Nullable + private Vec3 findTreePatrolWaypoint(Vec3 center, double angle) { + for (int attempt = 0; attempt < 10; attempt++) { + double candidateAngle = angle + attempt * 0.22D; + double x = center.x + Math.cos(candidateAngle) * TREE_ORBIT_RADIUS; + double z = center.z + Math.sin(candidateAngle) * TREE_ORBIT_RADIUS; + double vertical = 0.5D + 0.5D * Math.sin(candidateAngle); + double y = this.treePatrolMinimumY + + (this.treePatrolMaximumY - this.treePatrolMinimumY) * vertical; + Vec3 candidate = new Vec3(x, y, z); + if (this.clearTreePatrolPath(candidate)) { + return candidate; + } + } + return null; + } + + private boolean clearTreePatrolPath(Vec3 destination) { + Vec3 start = this.position(); + for (int sample = 1; sample <= TREE_ORBIT_PATH_SAMPLES; sample++) { + double progress = sample / (double) TREE_ORBIT_PATH_SAMPLES; + Vec3 point = start.lerp(destination, progress); + AABB box = this.getBoundingBox().move(point.x - this.getX(), point.y - this.getY(), point.z - this.getZ()); + if (!this.level().noCollision(this, box)) { + return false; + } + } + return true; + } + private void tickRoyalPunishment() { if (this.exileTarget == null && this.titheTarget == null && this.targetShotPlayer == null && this.sealedTarget == null) { return; @@ -1013,6 +1101,31 @@ public class KingEntity extends RoyalBossEntity { return super.hurt(source, amount); } + @Override + public void addAdditionalSaveData(CompoundTag tag) { + super.addAdditionalSaveData(tag); + tag.putBoolean("TreePatrolBound", this.treePatrolBound); + if (this.treePatrolCenter != null) { + tag.putDouble("TreePatrolCenterX", this.treePatrolCenter.x); + tag.putDouble("TreePatrolCenterY", this.treePatrolCenter.y); + tag.putDouble("TreePatrolCenterZ", this.treePatrolCenter.z); + tag.putDouble("TreePatrolMinimumY", this.treePatrolMinimumY); + tag.putDouble("TreePatrolMaximumY", this.treePatrolMaximumY); + tag.putDouble("TreePatrolAngle", this.treePatrolAngle); + } + } + + @Override + public void readAdditionalSaveData(CompoundTag tag) { + super.readAdditionalSaveData(tag); + if (tag.getBoolean("TreePatrolBound") && tag.contains("TreePatrolCenterX") + && tag.contains("TreePatrolCenterY") && tag.contains("TreePatrolCenterZ")) { + this.setTreePatrolHome( + new Vec3(tag.getDouble("TreePatrolCenterX"), tag.getDouble("TreePatrolCenterY"), tag.getDouble("TreePatrolCenterZ")), + tag.getDouble("TreePatrolMinimumY"), tag.getDouble("TreePatrolMaximumY"), tag.getDouble("TreePatrolAngle")); + } + } + public static boolean blocksHealingAround(LivingEntity target) { if (target.level().isClientSide) return false; return target.level().getEntitiesOfClass(KingEntity.class, target.getBoundingBox().inflate(128.0D), diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/QueenEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/QueenEntity.java index 9260683a..7ad5e04f 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/QueenEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/QueenEntity.java @@ -6,6 +6,9 @@ import com.craisinlord.antarchy.content.AntarchyObjects; import com.craisinlord.antarchy.content.AntarchyTags; import com.craisinlord.antarchy.content.entity.ManticoreEntity; import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi; +import com.craisinlord.antarchy.content.gravity.AntarchyGravityDirection; +import com.craisinlord.antarchy.content.gravity.AntarchyGravityTransition; +import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisUndersideManager; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -31,6 +34,7 @@ import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.AABB; import com.craisinlord.antarchy.content.entity.royal.beam.RoyalBeamSettings; import com.craisinlord.antarchy.content.entity.royal.beam.RoyalBeamTerrainMode; import com.craisinlord.antarchy.content.entity.royal.beam.RoyalBeamElement; @@ -73,6 +77,9 @@ public class QueenEntity extends RoyalBossEntity { private int idleWanderCooldownTicks; private final RoyalEffectController royalEffects = new RoyalEffectController(); private final Map frozenVelocities = new HashMap<>(); + private long naturalTrailSiteId = Long.MIN_VALUE; + @Nullable + private BlockPos naturalTrailHome; public QueenEntity(EntityType entityType, Level level) { super(entityType, level); @@ -270,6 +277,29 @@ public class QueenEntity extends RoyalBossEntity { return; } this.idleWanderCooldownTicks = 80 + this.random.nextInt(80); + if (this.naturalTrailHome != null) { + double distanceSquared = this.distanceToSqr( + this.naturalTrailHome.getX() + 0.5D, + this.naturalTrailHome.getY() + 0.5D, + this.naturalTrailHome.getZ() + 0.5D + ); + if (distanceSquared > 48.0D * 48.0D) { + this.getMoveControl().setWantedPosition( + this.naturalTrailHome.getX() + 0.5D, + this.naturalTrailHome.getY() + 0.5D, + this.naturalTrailHome.getZ() + 0.5D, + 1.0D + ); + return; + } + double angle = this.random.nextDouble() * Mth.TWO_PI; + double radius = 6.0D + this.random.nextDouble() * 22.0D; + double wx = this.naturalTrailHome.getX() + 0.5D + Math.cos(angle) * radius; + double wz = this.naturalTrailHome.getZ() + 0.5D + Math.sin(angle) * radius; + double wy = this.naturalTrailHome.getY() - 2.0D - this.random.nextDouble() * 7.0D; + this.getMoveControl().setWantedPosition(wx, wy, wz, 0.7D); + return; + } double angle = this.random.nextDouble() * Mth.TWO_PI; double radius = 6.0D + this.random.nextDouble() * 14.0D; double wx = this.getX() + Math.cos(angle) * radius; @@ -277,6 +307,39 @@ public class QueenEntity extends RoyalBossEntity { this.getMoveControl().setWantedPosition(wx, this.groundYBelow(wx, wz), wz, 0.7D); } + @Nullable + public static QueenEntity spawnFromUndersideTrail(ServerLevel level, BlockPos spawnPos, BlockPos homePos, long siteId, float yaw) { + if (!ThoraxisUndersideManager.isThoraxis(level) || spawnPos.getY() >= 0) { + return null; + } + AABB siteBounds = new AABB(homePos).inflate(160.0D); + java.util.List existing = level.getEntitiesOfClass(QueenEntity.class, siteBounds, + queen -> queen.naturalTrailSiteId == siteId && queen.isAlive()); + if (!existing.isEmpty()) { + return existing.getFirst(); + } + if (!level.hasChunksAt(spawnPos.offset(-16, -2, -16), spawnPos.offset(16, 18, 16))) { + return null; + } + QueenEntity queen = AntarchyObjects.QUEEN.get().create(level); + if (queen == null) { + return null; + } + queen.moveTo(spawnPos.getX() + 0.5D, spawnPos.getY(), spawnPos.getZ() + 0.5D, yaw, 0.0F); + if (!level.noCollision(queen, queen.getBoundingBox())) { + return null; + } + queen.finalizeSpawn(level, level.getCurrentDifficultyAt(spawnPos), MobSpawnType.CHUNK_GENERATION, null); + queen.naturalTrailSiteId = siteId; + queen.naturalTrailHome = homePos.immutable(); + queen.setPersistenceRequired(); + queen.setNoGravity(false); + ThoraxisUndersideManager.applyUndersideInversion(queen); + AntarchyGravityApi.setAirborneGravityDirection(queen, AntarchyGravityDirection.UP, true, new AntarchyGravityTransition(12)); + queen.resetFallDistance(); + return level.addFreshEntity(queen) ? queen : null; + } + private int cooldown(int base) { return this.royalEffects.active("acceleration") ? Math.max(20, base / 2) : base; } @@ -625,6 +688,10 @@ public class QueenEntity extends RoyalBossEntity { tag.putInt("GravityStompCooldownTicks", this.gravityStompCooldownTicks); tag.putInt("AccelerationCooldownTicks", this.accelerationCooldownTicks); tag.putInt("BlackHoleCooldownTicks", this.blackHoleCooldownTicks); + if (this.naturalTrailHome != null) { + tag.putLong("NaturalTrailSiteId", this.naturalTrailSiteId); + tag.putLong("NaturalTrailHome", this.naturalTrailHome.asLong()); + } } @Override @@ -636,5 +703,9 @@ public class QueenEntity extends RoyalBossEntity { this.crushingGravityCooldownTicks = Math.max(0, tag.getInt("CrushingGravityCooldownTicks")); this.accelerationCooldownTicks = Math.max(0, tag.getInt("AccelerationCooldownTicks")); this.blackHoleCooldownTicks = Math.max(0, tag.getInt("BlackHoleCooldownTicks")); + if (tag.contains("NaturalTrailHome")) { + this.naturalTrailSiteId = tag.getLong("NaturalTrailSiteId"); + this.naturalTrailHome = BlockPos.of(tag.getLong("NaturalTrailHome")); + } } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBossEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBossEntity.java index 713d2ea2..fc3fb78b 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBossEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/royal/RoyalBossEntity.java @@ -263,6 +263,10 @@ public abstract class RoyalBossEntity extends Monster implements GeoEntity, Mult return 0.35D; } + protected boolean shouldClearObstruction() { + return true; + } + protected double biteApproachSpeed() { return 1.3D; } @@ -397,7 +401,8 @@ public abstract class RoyalBossEntity extends Monster implements GeoEntity, Mult @Override public void tick() { super.tick(); - if (!this.level().isClientSide + if (this.shouldClearObstruction() + && !this.level().isClientSide && !this.isDeadOrDying() && this.tickCount % OBSTRUCTION_CLEAR_INTERVAL_TICKS == 0 && this.isInWall()) { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/cloud_shark/SharknadoManager.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/stratoshark/SharknadoManager.java similarity index 92% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/cloud_shark/SharknadoManager.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/stratoshark/SharknadoManager.java index 5960e1e1..c425306d 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/cloud_shark/SharknadoManager.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/stratoshark/SharknadoManager.java @@ -1,4 +1,4 @@ -package com.craisinlord.antarchy.content.entity.cloud_shark; +package com.craisinlord.antarchy.content.entity.stratoshark; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; @@ -47,24 +47,24 @@ public final class SharknadoManager { } - public boolean tryFormOrJoin(CloudSharkEntity shark, ServerLevel level) { + public boolean tryFormOrJoin(StratosharkEntity shark, ServerLevel level) { if (tryJoinExisting(shark)) return true; - List soloNearby = getSoloSharksNear(shark, level); + List soloNearby = getSoloSharksNear(shark, level); if (soloNearby.size() + 1 < MIN_SHARKS_TO_FORM) return false; UUID myUuid = shark.getUUID(); - for (CloudSharkEntity other : soloNearby) { + for (StratosharkEntity other : soloNearby) { if (other.getUUID().compareTo(myUuid) < 0) return false; } - List all = new ArrayList<>(); + List all = new ArrayList<>(); all.add(shark); all.addAll(soloNearby); formTornado(all, level); return true; } - private void formTornado(List sharks, ServerLevel level) { + private void formTornado(List sharks, ServerLevel level) { UUID id = UUID.randomUUID(); SharknadoEntry entry = new SharknadoEntry(id); int idx = 0; @@ -72,7 +72,7 @@ public final class SharknadoManager { for (int tier = 2; tier >= 0; tier--) { for (int slot = 0; slot < TIER_MAX_SLOTS[tier]; slot++) { if (idx >= sharks.size()) break outer; - CloudSharkEntity s = sharks.get(idx++); + StratosharkEntity s = sharks.get(idx++); entry.add(s, tier, slot); sharkToTornado.put(s.getUUID(), id); s.onJoinSharknado(id, tier, slot); @@ -87,7 +87,7 @@ public final class SharknadoManager { tornadoes.put(id, entry); } - private boolean tryJoinExisting(CloudSharkEntity shark) { + private boolean tryJoinExisting(StratosharkEntity shark) { UUID bestId = null; double bestDistSqr = FORM_SEARCH_RADIUS_SQR; @@ -210,7 +210,7 @@ public final class SharknadoManager { } - public void unregisterShark(CloudSharkEntity shark) { + public void unregisterShark(StratosharkEntity shark) { UUID tornadoId = sharkToTornado.remove(shark.getUUID()); if (tornadoId == null) return; SharknadoEntry entry = tornadoes.get(tornadoId); @@ -275,10 +275,10 @@ public final class SharknadoManager { } - private List getSoloSharksNear(CloudSharkEntity seeker, ServerLevel level) { - List result = new ArrayList<>(); - for (CloudSharkEntity other : level.getEntitiesOfClass( - CloudSharkEntity.class, seeker.getBoundingBox().inflate(FORM_SEARCH_RADIUS))) { + private List getSoloSharksNear(StratosharkEntity seeker, ServerLevel level) { + List result = new ArrayList<>(); + for (StratosharkEntity other : level.getEntitiesOfClass( + StratosharkEntity.class, seeker.getBoundingBox().inflate(FORM_SEARCH_RADIUS))) { if (other == seeker) continue; if (sharkToTornado.containsKey(other.getUUID())) continue; double dx = other.getX() - seeker.getX(); @@ -303,11 +303,11 @@ public final class SharknadoManager { SharknadoEntry(UUID id) { this.id = id; } - void add(CloudSharkEntity shark, int tier, int slot) { + void add(StratosharkEntity shark, int tier, int slot) { slots.add(new SharkSlot(shark, tier, slot)); } - void removeShark(CloudSharkEntity shark) { + void removeShark(StratosharkEntity shark) { slots.removeIf(s -> s.shark == shark); } @@ -386,11 +386,11 @@ public final class SharknadoManager { } private static final class SharkSlot { - final CloudSharkEntity shark; + final StratosharkEntity shark; final int tier; final int slot; - SharkSlot(CloudSharkEntity shark, int tier, int slot) { + SharkSlot(StratosharkEntity shark, int tier, int slot) { this.shark = shark; this.tier = tier; this.slot = slot; diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/cloud_shark/CloudSharkEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/stratoshark/StratosharkEntity.java similarity index 95% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/cloud_shark/CloudSharkEntity.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/stratoshark/StratosharkEntity.java index 92e65936..0bcbf050 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/cloud_shark/CloudSharkEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/entity/stratoshark/StratosharkEntity.java @@ -1,4 +1,4 @@ -package com.craisinlord.antarchy.content.entity.cloud_shark; +package com.craisinlord.antarchy.content.entity.stratoshark; import com.craisinlord.antarchy.config.AntarchySettings; import com.craisinlord.antarchy.content.AntarchySoundEvents; @@ -45,7 +45,7 @@ import software.bernie.geckolib.util.GeckoLibUtil; import java.util.EnumSet; import java.util.UUID; -public class CloudSharkEntity extends Monster implements GeoEntity { +public class StratosharkEntity extends Monster implements GeoEntity { private static final double PATROL_SPEED = 0.95D; private static final double STRAFE_SPEED = 1.2D; private static final double DIVE_SPEED = 1.9D; @@ -72,7 +72,7 @@ public class CloudSharkEntity extends Monster implements GeoEntity { private static final net.minecraft.network.syncher.EntityDataAccessor ANIMATION_STATE = net.minecraft.network.syncher.SynchedEntityData.defineId( - CloudSharkEntity.class, net.minecraft.network.syncher.EntityDataSerializers.INT); + StratosharkEntity.class, net.minecraft.network.syncher.EntityDataSerializers.INT); @Nullable private Vec3 patrolTarget; @Nullable private Vec3 recoveryTarget; @Nullable private Vec3 strafeTarget; @@ -98,7 +98,7 @@ public class CloudSharkEntity extends Monster implements GeoEntity { private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); - public CloudSharkEntity(EntityType entityType, Level level) { + public StratosharkEntity(EntityType entityType, Level level) { super(entityType, level); this.moveControl = new FlyingMoveControl(this, 20, true); this.xpReward = 8; @@ -106,23 +106,23 @@ public class CloudSharkEntity extends Monster implements GeoEntity { public static AttributeSupplier.Builder createAttributes() { return Mob.createMobAttributes() - .add(Attributes.MAX_HEALTH, AntarchySettings.cloudSharkHealth()) - .add(Attributes.ATTACK_DAMAGE, AntarchySettings.cloudSharkAttackDamage()) - .add(Attributes.MOVEMENT_SPEED, AntarchySettings.cloudSharkMovementSpeed()) - .add(Attributes.FLYING_SPEED, AntarchySettings.cloudSharkFlyingSpeed()) + .add(Attributes.MAX_HEALTH, AntarchySettings.stratosharkHealth()) + .add(Attributes.ATTACK_DAMAGE, AntarchySettings.stratosharkAttackDamage()) + .add(Attributes.MOVEMENT_SPEED, AntarchySettings.stratosharkMovementSpeed()) + .add(Attributes.FLYING_SPEED, AntarchySettings.stratosharkFlyingSpeed()) .add(Attributes.FOLLOW_RANGE, 40.0D) - .add(Attributes.KNOCKBACK_RESISTANCE, AntarchySettings.cloudSharkKnockbackResistance()); + .add(Attributes.KNOCKBACK_RESISTANCE, AntarchySettings.stratosharkKnockbackResistance()); } @Override public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor level, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.MobSpawnType spawnReason, net.minecraft.world.entity.SpawnGroupData spawnData) { - com.craisinlord.antarchy.content.entity.ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.cloudSharkHealth()); + com.craisinlord.antarchy.content.entity.ConfiguredMobSpawnUtil.applyConfiguredHealth(this, AntarchySettings.stratosharkHealth()); return super.finalizeSpawn(level, difficulty, spawnReason, spawnData); } private static final int MIN_SPAWN_HEIGHT_ABOVE_TERRAIN = 16; - public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, + public static boolean canSpawn(EntityType entityType, ServerLevelAccessor level, MobSpawnType spawnReason, BlockPos pos, RandomSource random) { if (level.getDifficulty() == Difficulty.PEACEFUL || !level.getFluidState(pos).isEmpty()) { return false; @@ -149,9 +149,9 @@ public class CloudSharkEntity extends Monster implements GeoEntity { this.goalSelector.addGoal(1, new SharknadoOrbitGoal(this)); HurtByTargetGoal hurtByTargetGoal = new HurtByTargetGoal(this); - hurtByTargetGoal.setAlertOthers(CloudSharkEntity.class); + hurtByTargetGoal.setAlertOthers(StratosharkEntity.class); this.targetSelector.addGoal(1, hurtByTargetGoal); - this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, CloudSharkEntity::isTargetablePlayer)); + this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, StratosharkEntity::isTargetablePlayer)); } private static boolean isTargetablePlayer(LivingEntity target) { @@ -325,7 +325,7 @@ public class CloudSharkEntity extends Monster implements GeoEntity { Vec3 knockback = horizontal.scale(0.7D).add(sideways.scale(0.45D)); Vec3 worldKnockback = this.toWorld(knockback.x, 0.28D, knockback.z); livingTarget.push(worldKnockback.x, worldKnockback.y, worldKnockback.z); - this.playSound(AntarchySoundEvents.CLOUD_SHARK_BITE.get(), 1.0F, 0.85F + this.random.nextFloat() * 0.2F); + this.playSound(AntarchySoundEvents.STRATOSHARK_BITE.get(), 1.0F, 0.85F + this.random.nextFloat() * 0.2F); } return hurt; } @@ -343,10 +343,10 @@ public class CloudSharkEntity extends Monster implements GeoEntity { protected SoundEvent getAmbientSound() { return null; } @Override - protected SoundEvent getHurtSound(DamageSource damageSource) { return AntarchySoundEvents.CLOUD_SHARK_HURT.get(); } + protected SoundEvent getHurtSound(DamageSource damageSource) { return AntarchySoundEvents.STRATOSHARK_HURT.get(); } @Override - protected SoundEvent getDeathSound() { return AntarchySoundEvents.CLOUD_SHARK_DEATH.get(); } + protected SoundEvent getDeathSound() { return AntarchySoundEvents.STRATOSHARK_DEATH.get(); } @Override protected float getSoundVolume() { return 0.9F; } @@ -389,7 +389,7 @@ public class CloudSharkEntity extends Monster implements GeoEntity { return; } - this.playSound(AntarchySoundEvents.CLOUD_SHARK_FLY.get(), 0.7F, 1.0F); + this.playSound(AntarchySoundEvents.STRATOSHARK_FLY.get(), 0.7F, 1.0F); this.flySoundCooldown = FLY_SOUND_INTERVAL_TICKS; } @@ -555,7 +555,7 @@ public class CloudSharkEntity extends Monster implements GeoEntity { } } - private PlayState mainAnimController(AnimationState state) { + private PlayState mainAnimController(AnimationState state) { return switch (this.getAnimationState()) { case ANIM_ATTACK -> state.setAndContinue(ATTACK_ANIM); case ANIM_SWIM -> state.setAndContinue(SWIM_ANIM); @@ -663,9 +663,9 @@ public class CloudSharkEntity extends Monster implements GeoEntity { private static final class SharknadoOrbitGoal extends Goal { - private final CloudSharkEntity shark; + private final StratosharkEntity shark; - SharknadoOrbitGoal(CloudSharkEntity shark) { + SharknadoOrbitGoal(StratosharkEntity shark) { this.shark = shark; this.setFlags(EnumSet.of(Flag.MOVE)); } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityAccess.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityAccess.java index 4fd8661e..4b13e527 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityAccess.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityAccess.java @@ -13,6 +13,8 @@ public interface AntarchyGravityAccess { void antarchy$setGravityState(AntarchyGravityDirection direction, boolean forced, AntarchyGravityTransition transition); + void antarchy$setAirborneGravityState(AntarchyGravityDirection direction, boolean forced, AntarchyGravityTransition transition); + void antarchy$applySyncedGravityState( AntarchyGravityDirection direction, AntarchyGravityDirection previousDirection, diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityApi.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityApi.java index d36901f9..00e484dd 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityApi.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/gravity/AntarchyGravityApi.java @@ -77,6 +77,10 @@ public final class AntarchyGravityApi { access(entity).antarchy$setGravityState(direction, true, transition); } + public static void setAirborneGravityDirection(Entity entity, AntarchyGravityDirection direction, boolean forced, AntarchyGravityTransition transition) { + access(entity).antarchy$setAirborneGravityState(direction, forced, transition); + } + public static void clearForcedGravity(Entity entity) { access(entity).antarchy$setGravityState(AntarchyGravityDirection.DOWN, false, AntarchyGravityTransition.INSTANT); } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/BloodCrystalArmorItem.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/BloodCrystalArmorItem.java index 811ee14d..203afb13 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/BloodCrystalArmorItem.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/BloodCrystalArmorItem.java @@ -2,12 +2,15 @@ package com.craisinlord.antarchy.content.item; import com.craisinlord.antarchy.config.AntarchySettings; import com.craisinlord.antarchy.content.AntarchyObjects; +import com.craisinlord.antarchy.content.enchantment.AntarchyEnchantments; import java.util.List; import net.minecraft.ChatFormatting; import net.minecraft.core.Holder; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlotGroup; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ArmorItem; @@ -16,6 +19,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.level.Level; public class BloodCrystalArmorItem extends ArmorItem { private final Type armorType; @@ -83,12 +87,25 @@ public class BloodCrystalArmorItem extends ArmorItem { return builder.build(); } + @Override + public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) { + super.inventoryTick(stack, level, entity, slotId, isSelected); + if (this.armorType == Type.BOOTS) { + AntarchyEnchantments.ensure(stack, level.registryAccess(), AntarchyEnchantments.FEATHER_RISING, 1); + } + } + + @Override + public void onCraftedBy(ItemStack stack, Level level, Player player) { + super.onCraftedBy(stack, level, player); + if (this.armorType == Type.BOOTS) { + AntarchyEnchantments.ensure(stack, level.registryAccess(), AntarchyEnchantments.FEATHER_RISING, 1); + } + } + @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { tooltipComponents.add(Component.translatable("item.antarchy.blood_crystal_armor.tooltip").withStyle(ChatFormatting.RED)); - if (this.armorType == Type.BOOTS) { - tooltipComponents.add(Component.translatable("item.antarchy.blood_crystal_boots.tooltip2").withStyle(ChatFormatting.DARK_RED)); - } super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/TriffidGooBlockItem.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/FlytrapGooBlockItem.java similarity index 79% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/TriffidGooBlockItem.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/FlytrapGooBlockItem.java index 98111265..598ef913 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/TriffidGooBlockItem.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/FlytrapGooBlockItem.java @@ -9,14 +9,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.block.Block; -public class TriffidGooBlockItem extends BlockItem { - public TriffidGooBlockItem(Block block, Properties properties) { +public class FlytrapGooBlockItem extends BlockItem { + public FlytrapGooBlockItem(Block block, Properties properties) { super(block, properties); } @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { - tooltipComponents.add(Component.translatable("tooltip.antarchy.triffid_goo_block").withStyle(ChatFormatting.DARK_GREEN)); + tooltipComponents.add(Component.translatable("tooltip.antarchy.flytrap_goo_block").withStyle(ChatFormatting.DARK_GREEN)); super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JerryNucleusItem.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JerryNucleusItem.java index b4c17582..fa78a022 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JerryNucleusItem.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JerryNucleusItem.java @@ -1,10 +1,10 @@ package com.craisinlord.antarchy.content.item; import com.craisinlord.antarchy.content.block.BedBugEggBlock; -import com.craisinlord.antarchy.content.block.CreepingHorrorEggBlock; +import com.craisinlord.antarchy.content.block.CrawlingBlightEggBlock; import com.craisinlord.antarchy.content.block.JerryEggBlock; -import com.craisinlord.antarchy.content.block.JumpyBugEggBlock; -import com.craisinlord.antarchy.content.block.LurkingTerrorEggBlock; +import com.craisinlord.antarchy.content.block.SpringbugEggBlock; +import com.craisinlord.antarchy.content.block.SkulkingFrightEggBlock; import com.craisinlord.antarchy.content.block.SpitBugEggBlock; import java.util.List; import net.minecraft.ChatFormatting; @@ -34,9 +34,9 @@ public class JerryNucleusItem extends Item { BlockState state = context.getLevel().getBlockState(context.getClickedPos()); Block block = state.getBlock(); boolean handled = block instanceof BedBugEggBlock - || block instanceof CreepingHorrorEggBlock - || block instanceof LurkingTerrorEggBlock - || block instanceof JumpyBugEggBlock + || block instanceof CrawlingBlightEggBlock + || block instanceof SkulkingFrightEggBlock + || block instanceof SpringbugEggBlock || block instanceof SpitBugEggBlock || block instanceof JerryEggBlock || block instanceof TurtleEggBlock; @@ -51,11 +51,11 @@ public class JerryNucleusItem extends Item { BlockPos pos = context.getClickedPos(); if (block instanceof BedBugEggBlock eggBlock) { eggBlock.hatchWithNucleus(serverLevel, pos, state); - } else if (block instanceof CreepingHorrorEggBlock eggBlock) { + } else if (block instanceof CrawlingBlightEggBlock eggBlock) { eggBlock.hatchWithNucleus(serverLevel, pos, state); - } else if (block instanceof LurkingTerrorEggBlock eggBlock) { + } else if (block instanceof SkulkingFrightEggBlock eggBlock) { eggBlock.hatchWithNucleus(serverLevel, pos, state); - } else if (block instanceof JumpyBugEggBlock eggBlock) { + } else if (block instanceof SpringbugEggBlock eggBlock) { eggBlock.hatchWithNucleus(serverLevel, pos); } else if (block instanceof SpitBugEggBlock eggBlock) { eggBlock.hatchWithNucleus(serverLevel, pos); diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MinersDreamExcavation.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MinersDreamExcavation.java index 6d7e01a0..2042bb45 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MinersDreamExcavation.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/MinersDreamExcavation.java @@ -20,7 +20,7 @@ import net.minecraft.world.level.block.state.BlockState; import org.joml.Vector3f; public final class MinersDreamExcavation { - private static final Vector3f TRIFFID_GOO_COLOR = new Vector3f(0.35F, 0.85F, 0.4F); + private static final Vector3f FLYTRAP_GOO_COLOR = new Vector3f(0.35F, 0.85F, 0.4F); private static final int SLICES_BETWEEN_RUMBLE = 4; private final UUID owner; @@ -126,7 +126,7 @@ public final class MinersDreamExcavation { level.sendParticles(new BlockParticleOption(ParticleTypes.BLOCK, state), pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, 2, 0.25D, 0.25D, 0.25D, 0.02D); if (random.nextFloat() < 0.2F) { - level.sendParticles(new DustParticleOptions(TRIFFID_GOO_COLOR, 1.0F), + level.sendParticles(new DustParticleOptions(FLYTRAP_GOO_COLOR, 1.0F), pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, 1, 0.2D, 0.2D, 0.2D, 0.0D); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/RoyalAssailantArmorItem.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/RoyalAssailantArmorItem.java index 6801f2cd..2b905d32 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/RoyalAssailantArmorItem.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/RoyalAssailantArmorItem.java @@ -125,9 +125,6 @@ public class RoyalAssailantArmorItem extends ArmorItem { if (this.armorType == Type.CHESTPLATE) { tooltipComponents.add(Component.translatable("tooltip.antarchy.royal_assailant_chestplate.invert").withStyle(ChatFormatting.AQUA)); } - if (this.armorType == Type.BOOTS) { - tooltipComponents.add(Component.translatable("tooltip.antarchy.royal_assailant_boots.fall").withStyle(ChatFormatting.AQUA)); - } super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JumpyBootsHelper.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/SpringyBootsHelper.java similarity index 85% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JumpyBootsHelper.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/SpringyBootsHelper.java index db801b58..73c87734 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JumpyBootsHelper.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/SpringyBootsHelper.java @@ -1,6 +1,6 @@ package com.craisinlord.antarchy.content.item; -public final class JumpyBootsHelper { +public final class SpringyBootsHelper { public static final int CHARGE_TICKS_MAX = 30; public static final int PRIME_WINDOW_TICKS = 15; public static final int COOLDOWN_TICKS = 40; @@ -8,9 +8,9 @@ public final class JumpyBootsHelper { public static final float MAX_VERTICAL_BOOST = 2.0F; public static final float SPRINT_FORWARD_BOOST = 0.3F; public static final long FALL_PROTECTION_TICKS = 120L; - public static final String FALL_PROTECTION_NBT_KEY = "antarchy:jumpy_boots_protection_until"; + public static final String FALL_PROTECTION_NBT_KEY = "antarchy:springy_boots_protection_until"; - private JumpyBootsHelper() { + private SpringyBootsHelper() { } public static float verticalBoostFor(int chargeTicks) { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JumpyBootsItem.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/SpringyBootsItem.java similarity index 71% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JumpyBootsItem.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/SpringyBootsItem.java index 56606f28..1ef7356b 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/JumpyBootsItem.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/SpringyBootsItem.java @@ -11,13 +11,13 @@ import net.minecraft.world.item.TooltipFlag; import java.util.List; -public final class JumpyBootsItem extends ArmorItem { - public JumpyBootsItem(Holder material, Properties properties) { +public final class SpringyBootsItem extends ArmorItem { + public SpringyBootsItem(Holder material, Properties properties) { super(material, Type.BOOTS, properties); } - public static boolean isWearingJumpyBoots(net.minecraft.world.entity.LivingEntity entity) { - return entity != null && entity.getItemBySlot(net.minecraft.world.entity.EquipmentSlot.FEET).getItem() instanceof JumpyBootsItem; + public static boolean isWearingSpringyBoots(net.minecraft.world.entity.LivingEntity entity) { + return entity != null && entity.getItemBySlot(net.minecraft.world.entity.EquipmentSlot.FEET).getItem() instanceof SpringyBootsItem; } @Override @@ -27,7 +27,7 @@ public final class JumpyBootsItem extends ArmorItem { @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { - tooltipComponents.add(Component.translatable("tooltip.antarchy.jumpy_boots").withStyle(ChatFormatting.DARK_RED)); + tooltipComponents.add(Component.translatable("tooltip.antarchy.springy_boots").withStyle(ChatFormatting.DARK_RED)); super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/CloudSharkFinSoupItem.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/StratosharkFinSoupItem.java similarity index 79% rename from common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/CloudSharkFinSoupItem.java rename to common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/StratosharkFinSoupItem.java index 8dc861a0..70833002 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/CloudSharkFinSoupItem.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/StratosharkFinSoupItem.java @@ -9,14 +9,14 @@ import net.minecraft.world.item.TooltipFlag; import java.util.List; -public class CloudSharkFinSoupItem extends Item { - public CloudSharkFinSoupItem(Properties properties) { +public class StratosharkFinSoupItem extends Item { + public StratosharkFinSoupItem(Properties properties) { super(properties); } @Override public void appendHoverText(ItemStack stack, TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { - tooltipComponents.add(Component.translatable("tooltip.antarchy.cloud_shark_fin_soup").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.antarchy.stratoshark_fin_soup").withStyle(ChatFormatting.GRAY)); super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/royal/RoyalGearHelper.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/royal/RoyalGearHelper.java index 1bb9bdeb..3729c2f6 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/royal/RoyalGearHelper.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/item/royal/RoyalGearHelper.java @@ -1,12 +1,11 @@ package com.craisinlord.antarchy.content.item.royal; import com.craisinlord.antarchy.config.AntarchySettings; +import com.craisinlord.antarchy.content.enchantment.AntarchyEnchantments; import com.craisinlord.antarchy.content.item.RoyalAssailantArmorItem; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; @@ -24,6 +23,10 @@ public final class RoyalGearHelper { } public static void ensureRoyalArmorEnchantments(ItemStack stack, HolderLookup.Provider registries) { + if (stack.getItem() instanceof RoyalAssailantArmorItem armor + && armor.getArmorType() == net.minecraft.world.item.ArmorItem.Type.BOOTS) { + AntarchyEnchantments.ensure(stack, registries, AntarchyEnchantments.FEATHER_RISING, 1); + } if (!AntarchySettings.royalArmorComesEnchanted()) { return; } @@ -44,8 +47,4 @@ public final class RoyalGearHelper { } } - public static boolean hasUpwardFallImmunityBoots(LivingEntity entity) { - return entity.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof RoyalAssailantArmorItem armor - && armor.getArmorType() == net.minecraft.world.item.ArmorItem.Type.BOOTS; - } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/JumpyBootsLaunchPayload.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/JumpyBootsLaunchPayload.java deleted file mode 100644 index 705a7146..00000000 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/JumpyBootsLaunchPayload.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.craisinlord.antarchy.content.network; - -import com.craisinlord.antarchy.Antarchy; -import io.netty.buffer.ByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public record JumpyBootsLaunchPayload(int chargeTicks, boolean sprinting) implements CustomPacketPayload { - public static final Type TYPE = - new Type<>(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "jumpy_boots_launch")); - public static final StreamCodec STREAM_CODEC = - StreamCodec.composite( - ByteBufCodecs.VAR_INT, JumpyBootsLaunchPayload::chargeTicks, - ByteBufCodecs.BOOL, JumpyBootsLaunchPayload::sprinting, - JumpyBootsLaunchPayload::new - ); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/SpringyBootsLaunchPayload.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/SpringyBootsLaunchPayload.java new file mode 100644 index 00000000..2bd9acdd --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/network/SpringyBootsLaunchPayload.java @@ -0,0 +1,24 @@ +package com.craisinlord.antarchy.content.network; + +import com.craisinlord.antarchy.Antarchy; +import io.netty.buffer.ByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +public record SpringyBootsLaunchPayload(int chargeTicks, boolean sprinting) implements CustomPacketPayload { + public static final Type TYPE = + new Type<>(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "springy_boots_launch")); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.VAR_INT, SpringyBootsLaunchPayload::chargeTicks, + ByteBufCodecs.BOOL, SpringyBootsLaunchPayload::sprinting, + SpringyBootsLaunchPayload::new + ); + + @Override + public Type type() { + return TYPE; + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/ChronosphereManager.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/ChronosphereManager.java new file mode 100644 index 00000000..73a9cbd3 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/ChronosphereManager.java @@ -0,0 +1,65 @@ +package com.craisinlord.antarchy.content.time; + +import com.craisinlord.antarchy.content.enchantment.AntarchyEnchantments; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; + +public final class ChronosphereManager { + public static final double RATE = 0.35D; + private static final Map ACTIVE_FIELDS = new HashMap<>(); + + private ChronosphereManager() { + } + + public static void refresh(ServerPlayer player) { + if (!(player.level() instanceof ServerLevel level)) { + return; + } + int enchantmentLevel = AntarchyEnchantments.chronosphereLevel(player); + UUID playerId = player.getUUID(); + UUID fieldId = ACTIVE_FIELDS.get(playerId); + TimeDilationFieldEntity field = fieldId != null && level.getEntity(fieldId) instanceof TimeDilationFieldEntity existing + ? existing + : null; + if (enchantmentLevel <= 0 || !player.isAlive()) { + ACTIVE_FIELDS.remove(playerId); + if (field != null) { + field.discard(); + } + return; + } + List fields = new ArrayList<>(); + if (field == null) { + for (var entity : level.getAllEntities()) { + if (entity instanceof TimeDilationFieldEntity candidate && candidate.isChronosphere() && candidate.isOwnedBy(player)) { + fields.add(candidate); + } + } + } + if (field == null && fields.isEmpty()) { + field = TimeDilationApi.createField(level, player.position(), radius(enchantmentLevel), RATE, -1, player.getUUID(), false); + field.configureChronosphere(player); + } else if (field == null) { + field = fields.getFirst(); + field.configureChronosphere(player); + for (int index = 1; index < fields.size(); index++) { + fields.get(index).discard(); + } + } + field.setFieldRadius(radius(enchantmentLevel)); + ACTIVE_FIELDS.put(playerId, field.getUUID()); + } + + public static double radius(int level) { + return switch (level) { + case 1 -> 1.5D; + case 2 -> 2.5D; + default -> 3.5D; + }; + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationApi.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationApi.java index 2304de25..1e9f99ee 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationApi.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationApi.java @@ -121,11 +121,15 @@ public final class TimeDilationApi { } public static boolean consumeTick(Entity entity, String timerKey) { + return consumeTicks(entity, timerKey) > 0; + } + + public static int consumeTicks(Entity entity, String timerKey) { double rate = getRate(entity); - if (Math.abs(rate - TimeDilationMath.NORMAL_RATE) < 0.001D || !(entity instanceof TimeDilationEntityAccess access)) { - return true; + if (entity instanceof TimeDilationEntityAccess access) { + return access.antarchy$consumeTimeDilationTicks(timerKey, rate); } - return access.antarchy$consumeTimeDilationTick(timerKey, rate); + return 1; } public static int scaleCooldownTicks(Entity entity, int ticks) { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationEntityAccess.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationEntityAccess.java index af7ed8af..5bb9002f 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationEntityAccess.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationEntityAccess.java @@ -11,6 +11,8 @@ public interface TimeDilationEntityAccess { boolean antarchy$consumeTimeDilationTick(String timerKey, double rate); + int antarchy$consumeTimeDilationTicks(String timerKey, double rate); + boolean antarchy$isInTimeDilationMove(); void antarchy$setInTimeDilationMove(boolean inMove); diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationFieldEntity.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationFieldEntity.java index 6da445bc..e6b226bf 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationFieldEntity.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationFieldEntity.java @@ -11,6 +11,9 @@ import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import java.util.UUID; @@ -32,6 +35,7 @@ public class TimeDilationFieldEntity extends Entity { private UUID anchorId; private int missingAnchorTicks; private boolean visual = true; + private boolean chronosphere; public TimeDilationFieldEntity(EntityType entityType, Level level) { super(entityType, level); @@ -67,11 +71,26 @@ public class TimeDilationFieldEntity extends Entity { this.missingAnchorTicks = 0; } + public void configureChronosphere(Entity owner) { + this.ownerId = owner.getUUID(); + this.attachTo(owner); + this.durationTicks = -1; + this.visual = false; + this.chronosphere = true; + } + + public boolean isChronosphere() { + return this.chronosphere; + } + public boolean affects(Entity entity) { if (entity instanceof RoyalBlackHoleEntity || this.isOwnedBy(entity) || this.anchorId != null && this.anchorId.equals(entity.getUUID())) { return false; } + if (this.chronosphere && !(entity instanceof LivingEntity || entity instanceof Projectile || entity instanceof ItemEntity)) { + return false; + } if (this.ownerId != null && this.level() instanceof ServerLevel level && level.getEntity(this.ownerId) instanceof QueenEntity) { return !entity.getType().is(AntarchyTags.Entities.QUEEN_DOES_NOT_ATTACK); @@ -103,6 +122,18 @@ public class TimeDilationFieldEntity extends Entity { : anchor.position(); this.setPos(center.x, center.y, center.z); this.missingAnchorTicks = 0; + if (this.chronosphere && this.age % 20 == 0) { + if (!(anchor instanceof net.minecraft.server.level.ServerPlayer player)) { + this.discard(); + return; + } + int levelValue = com.craisinlord.antarchy.content.enchantment.AntarchyEnchantments.chronosphereLevel(player); + if (levelValue <= 0) { + this.discard(); + return; + } + this.setFieldRadius(ChronosphereManager.radius(levelValue)); + } } else if (++this.missingAnchorTicks > 20) { this.discard(); return; @@ -165,6 +196,7 @@ public class TimeDilationFieldEntity extends Entity { this.ownerId = tag.hasUUID("OwnerUuid") ? tag.getUUID("OwnerUuid") : null; this.anchorId = tag.hasUUID("AnchorUuid") ? tag.getUUID("AnchorUuid") : null; this.visual = !tag.contains("Visual") || tag.getBoolean("Visual"); + this.chronosphere = tag.getBoolean("Chronosphere"); } @Override @@ -180,5 +212,6 @@ public class TimeDilationFieldEntity extends Entity { tag.putUUID("AnchorUuid", this.anchorId); } tag.putBoolean("Visual", this.visual); + tag.putBoolean("Chronosphere", this.chronosphere); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationManager.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationManager.java index 2daa25e0..ff6fdcf8 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationManager.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/time/TimeDilationManager.java @@ -56,6 +56,7 @@ public final class TimeDilationManager { private static void syncFieldSnapshots(ServerLevel level, List fields, TrackingState tracking) { List snapshots = fields.stream() + .filter(field -> !field.isChronosphere()) .map(field -> new TimeDilationFieldSnapshot( field.getX(), field.getY(), field.getZ(), field.fieldRadius(), field.fieldRate(), field.fieldAge(), field.fieldDurationTicks())) diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/cavaryn/CavarynEggPatchFeature.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/cavaryn/CavarynEggPatchFeature.java index 90f743c6..1766f73f 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/cavaryn/CavarynEggPatchFeature.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/cavaryn/CavarynEggPatchFeature.java @@ -2,8 +2,8 @@ package com.craisinlord.antarchy.content.worldgen.cavaryn; import com.craisinlord.antarchy.Antarchy; import com.craisinlord.antarchy.content.AntarchyObjects; -import com.craisinlord.antarchy.content.block.CreepingHorrorEggBlock; -import com.craisinlord.antarchy.content.block.LurkingTerrorEggBlock; +import com.craisinlord.antarchy.content.block.CrawlingBlightEggBlock; +import com.craisinlord.antarchy.content.block.SkulkingFrightEggBlock; import com.mojang.serialization.Codec; import java.util.ArrayList; import java.util.List; @@ -45,7 +45,7 @@ public final class CavarynEggPatchFeature extends Feature { - private static final ResourceLocation JUMPY_BUG_EGG_ID = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "jumpy_bug_egg"); +public final class SpringbugEggCeilingFeature extends Feature { + private static final ResourceLocation SPRINGBUG_EGG_ID = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "springbug_egg"); private static final int SEARCH_RADIUS = 8; private static final int VERTICAL_SCAN = 24; private static final int SEARCH_ATTEMPTS = 24; private static final int MAX_PLACEMENTS = 3; - public JumpyBugEggCeilingFeature(Codec codec) { + public SpringbugEggCeilingFeature(Codec codec) { super(codec); } @Override public boolean place(FeaturePlaceContext context) { - Block eggBlock = getBlock(JUMPY_BUG_EGG_ID); + Block eggBlock = getBlock(SPRINGBUG_EGG_ID); if (eggBlock == null) { return false; } @@ -61,8 +61,8 @@ public final class JumpyBugEggCeilingFeature extends Feature { +public final class FlytrapPatchFeature extends Feature { private static final int PATCH_RADIUS = 5; private static final double PATCH_RADIUS_SQR = 30.25D; - public TriffidPatchFeature(Codec codec) { + public FlytrapPatchFeature(Codec codec) { super(codec); } @@ -45,18 +45,18 @@ public final class TriffidPatchFeature extends Feature return false; } - TriffidEntity triffid = AntarchyObjects.TRIFFID.get().create(serverLevel.getLevel()); - if (triffid == null) { + FlytrapEntity flytrap = AntarchyObjects.FLYTRAP.get().create(serverLevel.getLevel()); + if (flytrap == null) { return false; } DifficultyInstance difficulty = serverLevel.getCurrentDifficultyAt(center); - triffid.moveTo(center.getX() + 0.5D, center.getY() + 1.0D, center.getZ() + 0.5D, random.nextFloat() * 360.0F, 0.0F); - triffid.finalizeSpawn(serverLevel, difficulty, MobSpawnType.CHUNK_GENERATION, null); - triffid.setPersistenceRequired(); + flytrap.moveTo(center.getX() + 0.5D, center.getY() + 1.0D, center.getZ() + 0.5D, random.nextFloat() * 360.0F, 0.0F); + flytrap.finalizeSpawn(serverLevel, difficulty, MobSpawnType.CHUNK_GENERATION, null); + flytrap.setPersistenceRequired(); layPatch(level, center, random); - serverLevel.addFreshEntity(triffid); + serverLevel.addFreshEntity(flytrap); return true; } @@ -133,7 +133,7 @@ public final class TriffidPatchFeature extends Feature return null; } - BlockState goo = AntarchyObjects.TRIFFID_GOO_BLOCK.get().defaultBlockState(); + BlockState goo = AntarchyObjects.FLYTRAP_GOO_BLOCK.get().defaultBlockState(); BlockState mud = Blocks.MUD.defaultBlockState(); if (normalizedDistance < 0.32D) { diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/KingsTreeGridFeature.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/KingsTreeGridFeature.java index 507c614a..b22efd87 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/KingsTreeGridFeature.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/elythia/KingsTreeGridFeature.java @@ -1,6 +1,8 @@ package com.craisinlord.antarchy.content.worldgen.elythia; import com.craisinlord.antarchy.Antarchy; +import com.craisinlord.antarchy.content.AntarchyObjects; +import com.craisinlord.antarchy.content.entity.royal.KingEntity; import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; @@ -17,7 +19,10 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.LiquidSetting import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; +import java.util.List; import java.util.Optional; /** Places the authored King's Tree as independently generated chunk slices on a fixed world grid. */ @@ -83,6 +88,7 @@ public final class KingsTreeGridFeature extends Feature treeKings = serverLevel.getEntitiesOfClass(KingEntity.class, searchBox, + king -> king.isAlive() && king.isTreePatrolFor(treeCenter)); + if (!treeKings.isEmpty()) { + // Repair older worlds that already contain duplicate tree-bound Kings. + for (int index = 1; index < treeKings.size(); index++) { + treeKings.get(index).discard(); + } + return; + } + KingEntity king = AntarchyObjects.KING.get().create(serverLevel); + if (king == null) { + return; + } + double minimumY = baseY + 24.0D; + double maximumY = baseY + 304.0D; + double spawnY = (minimumY + maximumY) * 0.5D; + // Start just outside the central trunk, inside the tree's authored footprint. + king.moveTo(centerX + 48.5D, spawnY, centerZ + 0.5D, 90.0F, 0.0F); + king.setTreePatrolHome(treeCenter, minimumY, maximumY, 0.0D); + king.setPersistenceRequired(); + serverLevel.addFreshEntity(king); + } + private static ResourceLocation tileLocation(int tileX, int tileZ) { return ResourceLocation.fromNamespaceAndPath( Antarchy.MODID, diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenHavocTrailFeature.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenHavocTrailFeature.java new file mode 100644 index 00000000..d84a5a96 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenHavocTrailFeature.java @@ -0,0 +1,237 @@ +package com.craisinlord.antarchy.content.worldgen.thoraxis; + +import com.craisinlord.antarchy.Antarchy; +import com.craisinlord.antarchy.content.block.entity.QueenTrailSpawnMarkerBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; + +public final class QueenHavocTrailFeature extends Feature { + private static final ResourceLocation DREAM_SAND = id("dream_sand"); + private static final ResourceLocation DREAM_SANDSTONE = id("dream_sandstone"); + private static final ResourceLocation CUT_DREAM_SANDSTONE = id("cut_dream_sandstone"); + private static final ResourceLocation DREAM_FIRE = id("dream_fire_ceiling"); + private static final ResourceLocation SPAWN_MARKER = id("queen_trail_spawn_marker"); + private static final int CHAMBER_RADIUS = 30; + private static final int CHAMBER_DEPTH = 20; + + public QueenHavocTrailFeature() { + super(NoneFeatureConfiguration.CODEC); + } + + @Override + public boolean place(FeaturePlaceContext context) { + WorldGenLevel level = context.level(); + ChunkPos chunk = new ChunkPos(context.origin()); + int cellX = Math.floorDiv(chunk.getMiddleBlockX(), QueenTrailGrid.SPACING); + int cellZ = Math.floorDiv(chunk.getMiddleBlockZ(), QueenTrailGrid.SPACING); + boolean placed = false; + for (int x = cellX - 1; x <= cellX + 1; x++) { + for (int z = cellZ - 1; z <= cellZ + 1; z++) { + QueenTrailGrid.Site site = QueenTrailGrid.site(level.getSeed(), x, z); + placed |= placeSiteSlice(level, chunk, site); + } + } + return placed; + } + + private static boolean placeSiteSlice(WorldGenLevel level, ChunkPos chunk, QueenTrailGrid.Site site) { + int reach = site.length() + CHAMBER_RADIUS; + if (site.terminalX() + reach < chunk.getMinBlockX() || site.terminalX() - reach > chunk.getMaxBlockX() + || site.terminalZ() + reach < chunk.getMinBlockZ() || site.terminalZ() - reach > chunk.getMaxBlockZ()) { + return false; + } + boolean placed = placeChamber(level, chunk, site); + for (int index = 0; index < site.footprints(); index++) { + double progress = index / (double) Math.max(1, site.footprints() - 1); + double distance = 18.0D + (site.footprints() - 1 - index) * site.stride(); + double side = (index & 1) == 0 ? -2.5D : 2.5D; + double centerX = site.terminalX() - site.directionX() * distance - site.directionZ() * side; + double centerZ = site.terminalZ() - site.directionZ() * distance + site.directionX() * side; + placed |= placeFootprint(level, chunk, site, index, progress, centerX, centerZ); + if (index % 4 == 2) { + double craterSide = ((site.id() >>> (index & 31)) & 1L) == 0L ? -5.0D : 5.0D; + placed |= placeCrater(level, chunk, site, index, progress, + centerX - site.directionZ() * craterSide, + centerZ + site.directionX() * craterSide); + } + } + if (contains(chunk, site.terminalX(), site.terminalZ())) { + placed |= placeMarker(level, site); + } + return placed; + } + + private static boolean placeFootprint(WorldGenLevel level, ChunkPos chunk, QueenTrailGrid.Site site, int index, + double progress, double centerX, double centerZ) { + boolean placed = false; + int minX = Math.max(chunk.getMinBlockX(), (int) Math.floor(centerX - 4.0D)); + int maxX = Math.min(chunk.getMaxBlockX(), (int) Math.ceil(centerX + 4.0D)); + int minZ = Math.max(chunk.getMinBlockZ(), (int) Math.floor(centerZ - 4.0D)); + int maxZ = Math.min(chunk.getMaxBlockZ(), (int) Math.ceil(centerZ + 4.0D)); + for (int x = minX; x <= maxX; x++) { + for (int z = minZ; z <= maxZ; z++) { + double dx = x + 0.5D - centerX; + double dz = z + 0.5D - centerZ; + double forward = dx * site.directionX() + dz * site.directionZ(); + double lateral = -dx * site.directionZ() + dz * site.directionX(); + boolean pad = square((forward + 0.5D) / 2.5D) + square(lateral / 2.0D) <= 1.0D; + boolean toes = toe(forward, lateral, -1.5D) || toe(forward, lateral, 0.0D) || toe(forward, lateral, 1.5D); + if (!pad && !toes) { + continue; + } + int depth = progress > 0.78D ? 3 : progress > 0.35D ? 2 : 1; + double fireChance = 0.12D + progress * 0.48D; + placed |= carvePrintColumn(level, x, z, depth, unit(site.id(), x, z, index) < fireChance, + index % 3 == 0 ? CUT_DREAM_SANDSTONE : DREAM_SANDSTONE); + } + } + return placed; + } + + private static boolean placeCrater(WorldGenLevel level, ChunkPos chunk, QueenTrailGrid.Site site, int index, + double progress, double centerX, double centerZ) { + int radius = progress > 0.65D ? 4 : 3; + boolean placed = false; + for (int x = Math.max(chunk.getMinBlockX(), (int) centerX - radius); x <= Math.min(chunk.getMaxBlockX(), (int) centerX + radius); x++) { + for (int z = Math.max(chunk.getMinBlockZ(), (int) centerZ - radius); z <= Math.min(chunk.getMaxBlockZ(), (int) centerZ + radius); z++) { + double distance = square((x + 0.5D - centerX) / radius) + square((z + 0.5D - centerZ) / radius); + if (distance <= 1.0D && unit(site.id() ^ 0x6A09E667F3BCC909L, x, z, index) > distance * 0.35D) { + placed |= carvePrintColumn(level, x, z, distance < 0.32D ? 2 : 1, + unit(site.id(), z, x, index + 31) < 0.35D + progress * 0.35D, DREAM_SANDSTONE); + } + } + } + return placed; + } + + private static boolean placeChamber(WorldGenLevel level, ChunkPos chunk, QueenTrailGrid.Site site) { + int minX = Math.max(chunk.getMinBlockX(), site.terminalX() - CHAMBER_RADIUS); + int maxX = Math.min(chunk.getMaxBlockX(), site.terminalX() + CHAMBER_RADIUS); + int minZ = Math.max(chunk.getMinBlockZ(), site.terminalZ() - CHAMBER_RADIUS); + int maxZ = Math.min(chunk.getMaxBlockZ(), site.terminalZ() + CHAMBER_RADIUS); + boolean placed = false; + for (int x = minX; x <= maxX; x++) { + for (int z = minZ; z <= maxZ; z++) { + int dx = x - site.terminalX(); + int dz = z - site.terminalZ(); + int distanceSquared = dx * dx + dz * dz; + if (distanceSquared > CHAMBER_RADIUS * CHAMBER_RADIUS) { + continue; + } + BlockPos ceiling = findCeiling(level, x, z); + if (ceiling == null) { + continue; + } + for (int depth = 1; depth <= CHAMBER_DEPTH; depth++) { + BlockPos air = ceiling.below(depth); + if (!level.getBlockState(air).isAir()) { + level.setBlock(air, Blocks.AIR.defaultBlockState(), 2); + } + } + double edge = Math.sqrt(distanceSquared) / CHAMBER_RADIUS; + if (edge > 0.58D && unit(site.id() ^ 0xBB67AE8584CAA73BL, x, z, 0) < 0.18D + edge * 0.22D) { + placeCeilingFire(level, ceiling); + } + placed = true; + } + } + return placed; + } + + private static boolean placeMarker(WorldGenLevel level, QueenTrailGrid.Site site) { + BlockPos ceiling = findCeiling(level, site.terminalX(), site.terminalZ()); + if (ceiling == null) { + return false; + } + Block markerBlock = block(SPAWN_MARKER, Blocks.BARRIER); + BlockPos markerPos = ceiling.above(4); + level.setBlock(markerPos, markerBlock.defaultBlockState(), 2); + BlockEntity blockEntity = level.getBlockEntity(markerPos); + if (!(blockEntity instanceof QueenTrailSpawnMarkerBlockEntity marker)) { + return false; + } + BlockPos spawnPos = new BlockPos(site.terminalX(), ceiling.getY() - 17, site.terminalZ()); + BlockPos homePos = new BlockPos(site.terminalX(), ceiling.getY() - 2, site.terminalZ()); + float yaw = (float) Math.toDegrees(Math.atan2(site.directionZ(), site.directionX())) - 90.0F; + marker.configure(site.id(), spawnPos, homePos, yaw); + return true; + } + + private static boolean carvePrintColumn(WorldGenLevel level, int x, int z, int depth, boolean fire, ResourceLocation backingId) { + BlockPos ceiling = findCeiling(level, x, z); + if (ceiling == null) { + return false; + } + BlockPos backing = ceiling.above(depth); + level.setBlock(backing, block(backingId, Blocks.SANDSTONE).defaultBlockState(), 2); + for (int offset = 0; offset < depth; offset++) { + level.setBlock(ceiling.above(offset), Blocks.AIR.defaultBlockState(), 2); + } + if (fire) { + placeCeilingFire(level, backing); + } + return true; + } + + private static void placeCeilingFire(WorldGenLevel level, BlockPos support) { + BlockPos firePos = support.below(); + if (level.getBlockState(firePos).isAir()) { + level.setBlock(firePos, block(DREAM_FIRE, Blocks.SOUL_FIRE).defaultBlockState(), 2); + } + } + + private static BlockPos findCeiling(WorldGenLevel level, int x, int z) { + BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(x, -8, z); + int minimum = Math.max(level.getMinBuildHeight() + 20, -240); + for (int y = -8; y >= minimum; y--) { + cursor.setY(y); + if (isDreamSurface(level.getBlockState(cursor)) && level.getBlockState(cursor.below()).isAir()) { + return cursor.immutable(); + } + } + return null; + } + + private static boolean isDreamSurface(BlockState state) { + ResourceLocation id = BuiltInRegistries.BLOCK.getKey(state.getBlock()); + return DREAM_SAND.equals(id) || DREAM_SANDSTONE.equals(id) || CUT_DREAM_SANDSTONE.equals(id); + } + + private static boolean contains(ChunkPos chunk, int x, int z) { + return x >= chunk.getMinBlockX() && x <= chunk.getMaxBlockX() && z >= chunk.getMinBlockZ() && z <= chunk.getMaxBlockZ(); + } + + private static boolean toe(double forward, double lateral, double toeCenter) { + return square((forward - 2.2D) / 1.25D) + square((lateral - toeCenter) / 0.8D) <= 1.0D; + } + + private static double square(double value) { + return value * value; + } + + private static double unit(long seed, int x, int z, int salt) { + long value = seed ^ (long) x * 0x9E3779B97F4A7C15L ^ (long) z * 0xC2B2AE3D27D4EB4FL ^ (long) salt * 0x165667B19E3779F9L; + value ^= value >>> 30; + value *= 0xBF58476D1CE4E5B9L; + value ^= value >>> 27; + return (value >>> 11) * 0x1.0p-53; + } + + private static Block block(ResourceLocation id, Block fallback) { + return BuiltInRegistries.BLOCK.getOptional(id).orElse(fallback); + } + + private static ResourceLocation id(String path) { + return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, path); + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenTrailGrid.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenTrailGrid.java new file mode 100644 index 00000000..04ceb88a --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/QueenTrailGrid.java @@ -0,0 +1,38 @@ +package com.craisinlord.antarchy.content.worldgen.thoraxis; + +import net.minecraft.util.RandomSource; + +public final class QueenTrailGrid { + public static final int SPACING = 1_536; + private static final int JITTER_MARGIN = 256; + + private QueenTrailGrid() { + } + + public static Site site(long worldSeed, int cellX, int cellZ) { + long seed = mix(worldSeed ^ 0x51A7E4D39B20C16DL, cellX, cellZ); + RandomSource random = RandomSource.create(seed); + int usable = SPACING - JITTER_MARGIN * 2; + int x = cellX * SPACING + JITTER_MARGIN + random.nextInt(usable); + int z = cellZ * SPACING + JITTER_MARGIN + random.nextInt(usable); + double angle = random.nextDouble() * Math.PI * 2.0D; + int footprints = 16 + random.nextInt(7); + int stride = 6 + random.nextInt(2); + return new Site(seed, x, z, Math.cos(angle), Math.sin(angle), footprints, stride); + } + + private static long mix(long seed, int x, int z) { + long value = seed ^ (long) x * 0x9E3779B97F4A7C15L ^ (long) z * 0xC2B2AE3D27D4EB4FL; + value ^= value >>> 30; + value *= 0xBF58476D1CE4E5B9L; + value ^= value >>> 27; + value *= 0x94D049BB133111EBL; + return value ^ value >>> 31; + } + + public record Site(long id, int terminalX, int terminalZ, double directionX, double directionZ, int footprints, int stride) { + public int length() { + return this.footprints * this.stride + 18; + } + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisTransitionThroatFeature.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisTransitionThroatFeature.java new file mode 100644 index 00000000..038fb6bc --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisTransitionThroatFeature.java @@ -0,0 +1,83 @@ +package com.craisinlord.antarchy.content.worldgen.thoraxis; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.levelgen.Heightmap; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; + +public final class ThoraxisTransitionThroatFeature extends Feature { + public ThoraxisTransitionThroatFeature() { + super(NoneFeatureConfiguration.CODEC); + } + + @Override + public boolean place(FeaturePlaceContext context) { + WorldGenLevel level = context.level(); + BlockPos origin = context.origin(); + BlockPos center = new BlockPos(origin.getX(), ThoraxisUndersideManager.GRAVITY_FLIP_Y, origin.getZ()); + int upperSurface = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, center.getX(), center.getZ()) - 1; + int undersideSurface = findUndersideSurface(level, center); + if (upperSurface < ThoraxisUndersideManager.GRAVITY_FLIP_Y || undersideSurface < level.getMinBuildHeight()) { + return false; + } + + long seed = context.random().nextLong(); + for (int y = undersideSurface; y <= upperSurface; y++) { + int layerOffsetX = noise(seed, Math.floorDiv(y, 5), 17) * 2; + int layerOffsetZ = noise(seed, Math.floorDiv(y, 5), 31) * 2; + double radiusX = 3.5D + noise01(seed, Math.floorDiv(y, 11), 43) * 2.0D; + double radiusZ = 3.5D + noise01(seed, Math.floorDiv(y, 13), 59) * 2.0D; + + for (int x = -7; x <= 7; x++) { + for (int z = -7; z <= 7; z++) { + double dx = x - layerOffsetX; + double dz = z - layerOffsetZ; + double distance = Math.sqrt((dx * dx) / (radiusX * radiusX) + (dz * dz) / (radiusZ * radiusZ)); + double edgeNoise = noise01(seed, x * 3 + Math.floorDiv(y, 3), z * 3 + 71); + if (distance <= 0.72D + edgeNoise * 0.42D) { + level.setBlock(center.offset(x, y, z), Blocks.AIR.defaultBlockState(), 2); + } + } + } + } + + return true; + } + + private static int findUndersideSurface(WorldGenLevel level, BlockPos center) { + int minY = level.getMinBuildHeight(); + int firstSolid = Integer.MIN_VALUE; + for (int y = ThoraxisUndersideManager.GRAVITY_FLIP_Y - 1; y >= minY; y--) { + if (!level.getBlockState(center.atY(y)).isAir()) { + firstSolid = y; + break; + } + } + if (firstSolid == Integer.MIN_VALUE) { + return minY; + } + + int y = firstSolid; + while (y > minY && !level.getBlockState(center.atY(y - 1)).isAir()) { + y--; + } + return y; + } + + private static double noise01(long seed, int x, int z) { + long value = seed + 0x9E3779B97F4A7C15L; + value ^= x * 0x632BE59BD9B4E019L; + value ^= z * 0xC6BC279692B5CC83L; + value = (value ^ (value >>> 30)) * 0xBF58476D1CE4E5B9L; + value = (value ^ (value >>> 27)) * 0x94D049BB133111EBL; + value ^= value >>> 31; + return (value >>> 11) * 0x1.0p-53; + } + + private static int noise(long seed, int x, int z) { + return noise01(seed, x, z) < 0.5D ? -1 : 1; + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisUndersideManager.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisUndersideManager.java index cefd699c..1c25db4a 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisUndersideManager.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/worldgen/thoraxis/ThoraxisUndersideManager.java @@ -14,22 +14,25 @@ import java.util.WeakHashMap; import java.util.UUID; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; public final class ThoraxisUndersideManager { public static final int GRAVITY_FLIP_Y = 0; - private static final ResourceLocation THORAXIS_DIMENSION = ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "thoraxis"); + private static final net.minecraft.resources.ResourceLocation THORAXIS_DIMENSION = net.minecraft.resources.ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "thoraxis"); private static final AntarchyGravityTransition TRANSITION = new AntarchyGravityTransition(12); + private static final AntarchyGravityTransition THROAT_TRANSITION = new AntarchyGravityTransition(20); private static final int EFFECT_DURATION_TICKS = 50; private static final int EFFECT_REFRESH_THRESHOLD_TICKS = 10; private static final int DISCOVERY_INTERVAL_TICKS = 5; @@ -40,6 +43,9 @@ public final class ThoraxisUndersideManager { private static final int ENTER_UNDERSIDE_Y = GRAVITY_FLIP_Y - 4; private static final int EXIT_UNDERSIDE_Y = GRAVITY_FLIP_Y + 4; private static final int FLIP_COOLDOWN_TICKS = 40; + private static final int CROSSING_TIMEOUT_TICKS = 30; + private static final int SETTLE_TIMEOUT_TICKS = 70; + private static final double MIN_CROSSING_SPEED = 0.48D; private static final Map STATES = new WeakHashMap<>(); private ThoraxisUndersideManager() { @@ -59,6 +65,7 @@ public final class ThoraxisUndersideManager { long startNanos = System.nanoTime(); long now = level.getGameTime(); + tickPlayerTransitions(level, tracking, now); int discoveredLiving = 0; int discoveredItems = 0; if (now % DISCOVERY_INTERVAL_TICKS == 0L) { @@ -78,6 +85,9 @@ public final class ThoraxisUndersideManager { } if (entity instanceof LivingEntity living) { + if (living instanceof Player) { + continue; + } boolean hasEffect = living.hasEffect(AntarchyObjects.INVERTED_EFFECT.get()); int threshold = hasEffect ? EXIT_UNDERSIDE_Y : ENTER_UNDERSIDE_Y; if (living.getY() < threshold) { @@ -150,6 +160,7 @@ public final class ThoraxisUndersideManager { private final Set entities = Collections.newSetFromMap(new IdentityHashMap<>()); private final Set forcedItems = Collections.newSetFromMap(new IdentityHashMap<>()); private final Map lastFlipTick = new java.util.HashMap<>(); + private final Map playerCrossings = new java.util.HashMap<>(); private long lastDiagnosticTick = Long.MIN_VALUE / 2L; private DiscoveryStats discover(ServerLevel level) { @@ -178,6 +189,105 @@ public final class ThoraxisUndersideManager { entities.clear(); forcedItems.clear(); lastFlipTick.clear(); + playerCrossings.clear(); + } + } + + private static void tickPlayerTransitions(ServerLevel level, TrackingState tracking, long now) { + tracking.playerCrossings.keySet().removeIf(uuid -> level.getPlayerByUUID(uuid) == null); + for (ServerPlayer player : level.players()) { + PlayerCrossing crossing = tracking.playerCrossings.get(player.getUUID()); + if (crossing != null) { + tickPlayerCrossing(player, crossing, tracking, now); + continue; + } + + if (player.isSpectator()) { + continue; + } + + if (isCrossingGravityBoundary(player) && flipReady(tracking, player.getUUID(), now)) { + boolean toUnderside = AntarchyGravityApi.getGravityDirection(player) == AntarchyGravityDirection.DOWN; + if (!toUnderside) { + refreshInvertedEffect(player); + } + tracking.playerCrossings.put(player.getUUID(), new PlayerCrossing(toUnderside)); + continue; + } + + MobEffectInstance effect = player.getEffect(AntarchyObjects.INVERTED_EFFECT.get()); + if (player.getY() < ENTER_UNDERSIDE_Y) { + refreshInvertedEffect(player); + } else if (effect != null && isUndersideEffect(effect) && player.getY() < EXIT_UNDERSIDE_Y) { + refreshInvertedEffect(player); + } + } + } + + private static void tickPlayerCrossing(ServerPlayer player, PlayerCrossing crossing, TrackingState tracking, long now) { + crossing.ticks++; + Vec3 velocity = AntarchyGravityApi.getWorldVelocity(player); + if (!crossing.flipped) { + if (!crossing.toUnderside) { + refreshInvertedEffect(player); + } + if (crossing.ticks > CROSSING_TIMEOUT_TICKS + || (crossing.toUnderside && velocity.y > 0.08D) + || (!crossing.toUnderside && velocity.y < -0.08D)) { + tracking.playerCrossings.remove(player.getUUID()); + return; + } + + AABB bounds = player.getBoundingBox(); + boolean clear = crossing.toUnderside ? bounds.maxY < GRAVITY_FLIP_Y : bounds.minY > EXIT_UNDERSIDE_Y; + if (!clear) { + return; + } + + AntarchyGravityDirection destination = crossing.toUnderside + ? AntarchyGravityDirection.UP + : AntarchyGravityDirection.DOWN; + AntarchyGravityApi.setAirborneGravityDirection(player, destination, crossing.toUnderside, THROAT_TRANSITION); + player.resetFallDistance(); + crossing.flipped = true; + crossing.ticks = 0; + tracking.lastFlipTick.put(player.getUUID(), now); + if (crossing.toUnderside) { + refreshInvertedEffect(player); + } else { + player.removeEffect(AntarchyObjects.INVERTED_EFFECT.get()); + } + return; + } + + if (crossing.toUnderside) { + refreshInvertedEffect(player); + } + if (player.onGround() || crossing.ticks >= SETTLE_TIMEOUT_TICKS) { + tracking.playerCrossings.remove(player.getUUID()); + } + } + + private static boolean isCrossingGravityBoundary(ServerPlayer player) { + Vec3 velocity = AntarchyGravityApi.getWorldVelocity(player); + AABB swept = player.getBoundingBox().expandTowards(velocity.scale(-1.0D)).inflate(0.08D); + AntarchyGravityDirection direction = AntarchyGravityApi.getGravityDirection(player); + return direction == AntarchyGravityDirection.DOWN + ? swept.minY < GRAVITY_FLIP_Y && swept.maxY >= GRAVITY_FLIP_Y && velocity.y <= -MIN_CROSSING_SPEED + : swept.minY <= GRAVITY_FLIP_Y && swept.maxY > GRAVITY_FLIP_Y && velocity.y >= MIN_CROSSING_SPEED; + } + + private static boolean isUndersideEffect(MobEffectInstance effect) { + return effect.isAmbient() && !effect.isVisible(); + } + + private static final class PlayerCrossing { + private final boolean toUnderside; + private int ticks; + private boolean flipped; + + private PlayerCrossing(boolean toUnderside) { + this.toUnderside = toUnderside; } } @@ -225,6 +335,32 @@ public final class ThoraxisUndersideManager { return level.dimension().location().equals(THORAXIS_DIMENSION); } + /** True only while an entity is physically below Thoraxis' gravity boundary. */ + public static boolean isInUnderside(Entity entity) { + return isThoraxis(entity.level()) && entity.getY() < GRAVITY_FLIP_Y; + } + + /** + * Keeps projectile gravity positional: UP below Y=0 in Thoraxis and DOWN + * everywhere else. World velocity is preserved when the gravity frame changes. + */ + public static void updateProjectileGravity(Projectile projectile) { + boolean inUnderside = isInUnderside(projectile); + AntarchyGravityDirection desiredDirection = inUnderside + ? AntarchyGravityDirection.UP + : AntarchyGravityDirection.DOWN; + boolean stateMismatch = AntarchyGravityApi.getGravityDirection(projectile) != desiredDirection + || AntarchyGravityApi.isGravityForced(projectile) != inUnderside; + if (stateMismatch) { + AntarchyGravityApi.setAirborneGravityDirection( + projectile, + desiredDirection, + inUnderside, + AntarchyGravityTransition.INSTANT + ); + } + } + public static boolean isAboveUndersideExit(Entity entity) { return isThoraxis(entity.level()) && entity.getY() >= EXIT_UNDERSIDE_Y; } @@ -232,7 +368,6 @@ public final class ThoraxisUndersideManager { /** True while an entity is in the region where the underside gravity rule applies. */ public static boolean shouldInvertInUnderside(Entity entity) { return AntarchyGravityApi.isGravityInverted(entity) - && isThoraxis(entity.level()) - && entity.getY() < GRAVITY_FLIP_Y; + && isInUnderside(entity); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/AbstractArrowGravityMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/AbstractArrowGravityMixin.java index 16089fe7..620c31c7 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/AbstractArrowGravityMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/AbstractArrowGravityMixin.java @@ -34,7 +34,9 @@ public abstract class AbstractArrowGravityMixin { original.call(self); return; } + // Vanilla applies gravity as -getGravity(). Negate that acceleration to + // mirror the projectile's arc for the inverted Underside gravity. double gravity = self.getGravity(); - self.setDeltaMovement(self.getDeltaMovement().add(0.0D, gravity, 0.0D)); + self.setDeltaMovement(self.getDeltaMovement().add(0.0D, -gravity, 0.0D)); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/CrossbowItemGravityMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/CrossbowItemGravityMixin.java index a66a1cd6..15c5a1a5 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/CrossbowItemGravityMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/CrossbowItemGravityMixin.java @@ -3,7 +3,6 @@ package com.craisinlord.antarchy.mixins.gravity; import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi; import com.craisinlord.antarchy.content.gravity.AntarchyGravityDirection; import com.craisinlord.antarchy.content.gravity.AntarchyGravityRotationUtil; -import com.craisinlord.antarchy.config.AntarchySettings; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisUndersideManager; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; @@ -55,8 +54,6 @@ public abstract class CrossbowItemGravityMixin { } private static boolean antarchy$shouldFixProjectileSpawn(LivingEntity shooter) { - return ThoraxisUndersideManager.shouldInvertInUnderside(shooter) - && (!(shooter instanceof net.minecraft.world.entity.player.Player) - || AntarchySettings.invertProjectilesFromInvertedPlayers()); + return ThoraxisUndersideManager.shouldInvertInUnderside(shooter); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityGravityMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityGravityMixin.java index 620a4975..0c850486 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityGravityMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityGravityMixin.java @@ -195,6 +195,16 @@ public abstract class EntityGravityMixin implements AntarchyGravityAccess { } } + @Override + public void antarchy$setAirborneGravityState(AntarchyGravityDirection direction, boolean forced, AntarchyGravityTransition transition) { + Entity entity = this.antarchy$entity(); + net.minecraft.world.phys.Vec3 worldVelocity = AntarchyGravityApi.getWorldVelocity(entity); + this.antarchy$setGravityState(direction, forced, transition); + AntarchyGravityApi.setWorldVelocity(entity, worldVelocity); + entity.setOnGround(false); + entity.resetFallDistance(); + } + @Override public void antarchy$applySyncedGravityState( AntarchyGravityDirection direction, diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityMoveMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityMoveMixin.java index 5ac6cdd8..580da531 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityMoveMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/EntityMoveMixin.java @@ -154,9 +154,11 @@ public abstract class EntityMoveMixin { boolean movedY = movement.y != collided.y; boolean movedZ = movement.z != collided.z; boolean pressingIntoCeiling = movedY && movement.y > 0.0D; + boolean supportedByCeiling = entity.onGround() + || !entity.level().noCollision(entity, aabb.move(0.0D, 1.0E-5D, 0.0D)); float maxUpStep = entity.maxUpStep(); - if (!(maxUpStep > 0.0F) || !(pressingIntoCeiling || entity.onGround()) || !(movedX || movedZ)) { + if (!(maxUpStep > 0.0F) || !(pressingIntoCeiling || supportedByCeiling) || !(movedX || movedZ)) { cir.setReturnValue(PortalGunCollisionHelper.resolveCollision(entity, aabb, movement, collided)); return; } @@ -181,6 +183,46 @@ public abstract class EntityMoveMixin { } } + // Exact candidate heights can still fail for composite ceiling shapes + // (notably corner stairs). Mirror the older three-phase step routine: + // move away from the ceiling, cross the obstruction, then settle back + // toward the new ceiling surface. + Vec3 awayFromCeiling = Entity.collideBoundingBox( + entity, + new Vec3(0.0D, -(double) maxUpStep, 0.0D), + steppedBox, + entity.level(), + stepShapes + ); + if (awayFromCeiling.y < -1.0E-7D) { + AABB awayBox = steppedBox.move(awayFromCeiling); + Vec3 acrossStep = Entity.collideBoundingBox( + entity, + new Vec3(movement.x, 0.0D, movement.z), + awayBox, + entity.level(), + stepShapes + ); + if (acrossStep.horizontalDistanceSqr() > collided.horizontalDistanceSqr()) { + AABB acrossBox = awayBox.move(acrossStep); + Vec3 settleToCeiling = Entity.collideBoundingBox( + entity, + new Vec3(0.0D, -awayFromCeiling.y, 0.0D), + acrossBox, + entity.level(), + stepShapes + ); + double initialVerticalOffset = steppedBox.maxY - aabb.maxY; + Vec3 stepped = acrossStep.add( + 0.0D, + initialVerticalOffset + awayFromCeiling.y + settleToCeiling.y, + 0.0D + ); + cir.setReturnValue(PortalGunCollisionHelper.resolveCollision(entity, aabb, movement, stepped)); + return; + } + } + cir.setReturnValue(PortalGunCollisionHelper.resolveCollision(entity, aabb, movement, collided)); } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ProjectileGravityMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ProjectileGravityMixin.java index f28eb9de..4e995775 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ProjectileGravityMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ProjectileGravityMixin.java @@ -1,20 +1,36 @@ package com.craisinlord.antarchy.mixins.gravity; -import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi; -import com.craisinlord.antarchy.content.gravity.AntarchyGravityDirection; -import com.craisinlord.antarchy.content.gravity.AntarchyGravityRotationUtil; -import com.craisinlord.antarchy.config.AntarchySettings; +import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisUndersideManager; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.Projectile; -import net.minecraft.world.phys.Vec2; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Projectile.class) /* - * Flips generic projectile gravity for inverted shooters. + * Gives every projectile a gravity frame based on its own position in Thoraxis. + * A shooter can influence the initial aim, but cannot leave a projectile inverted + * after it exits the Underside. */ public abstract class ProjectileGravityMixin { + + @Inject(method = "shootFromRotation", at = @At("HEAD")) + private void antarchy$prepareGravityAwareShot( + Entity shooter, + float xRot, + float yRot, + float rotationOffset, + float velocity, + float inaccuracy, + CallbackInfo ci + ) { + ThoraxisUndersideManager.updateProjectileGravity((Projectile) (Object) this); + } + + @Inject(method = "tick", at = @At("HEAD")) + private void antarchy$updateUndersideGravity(CallbackInfo ci) { + ThoraxisUndersideManager.updateProjectileGravity((Projectile) (Object) this); + } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ThrowableProjectileGravityMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ThrowableProjectileGravityMixin.java index c659e752..6b5e9e1f 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ThrowableProjectileGravityMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/gravity/ThrowableProjectileGravityMixin.java @@ -35,7 +35,9 @@ public abstract class ThrowableProjectileGravityMixin { original.call(self); return; } + // Vanilla applies gravity as -getGravity(). Negate that acceleration to + // mirror the projectile's arc for the inverted Underside gravity. double gravity = self.getGravity(); - self.setDeltaMovement(self.getDeltaMovement().add(0.0D, gravity, 0.0D)); + self.setDeltaMovement(self.getDeltaMovement().add(0.0D, -gravity, 0.0D)); } } diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/EntityTimeDilationStateMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/EntityTimeDilationStateMixin.java index 15907972..7e64a0e8 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/EntityTimeDilationStateMixin.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/EntityTimeDilationStateMixin.java @@ -28,8 +28,10 @@ public abstract class EntityTimeDilationStateMixin implements TimeDilationEntity @Override public void antarchy$setTimeDilationRate(double rate) { + double previousRate = this.antarchy$timeDilationRate; this.antarchy$timeDilationRate = TimeDilationMath.clampRate(rate); - if (this.antarchy$timeDilationRate >= TimeDilationMath.NORMAL_RATE) { + if (previousRate != TimeDilationMath.NORMAL_RATE + && this.antarchy$timeDilationRate == TimeDilationMath.NORMAL_RATE) { this.antarchy$timeDilationTimerProgress.clear(); } } @@ -46,20 +48,25 @@ public abstract class EntityTimeDilationStateMixin implements TimeDilationEntity @Override public boolean antarchy$consumeTimeDilationTick(String timerKey, double rate) { + return this.antarchy$consumeTimeDilationTicks(timerKey, rate) > 0; + } + + @Override + public int antarchy$consumeTimeDilationTicks(String timerKey, double rate) { double clampedRate = TimeDilationMath.clampRate(rate); if (Math.abs(clampedRate - TimeDilationMath.NORMAL_RATE) < 0.001D) { - return true; + return 1; } double progress = this.antarchy$timeDilationTimerProgress.getOrDefault(timerKey, 0.0D) + clampedRate; int wholeTicks = (int) Math.floor(progress + 1.0E-9D); if (wholeTicks <= 0) { this.antarchy$timeDilationTimerProgress.put(timerKey, progress); - return false; + return 0; } this.antarchy$timeDilationTimerProgress.put(timerKey, progress - wholeTicks); - return true; + return wholeTicks; } @Override diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityChronosphereEquipmentMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityChronosphereEquipmentMixin.java new file mode 100644 index 00000000..cfd398de --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityChronosphereEquipmentMixin.java @@ -0,0 +1,21 @@ +package com.craisinlord.antarchy.mixins.time; + +import com.craisinlord.antarchy.content.time.ChronosphereManager; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(LivingEntity.class) +public abstract class LivingEntityChronosphereEquipmentMixin { + @Inject(method = "onEquipItem", at = @At("TAIL")) + private void antarchy$refreshChronosphere(EquipmentSlot slot, ItemStack oldStack, ItemStack newStack, CallbackInfo callback) { + if (slot == EquipmentSlot.CHEST && (Object) this instanceof ServerPlayer player) { + ChronosphereManager.refresh(player); + } + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityFoodUseTimeDilationMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityFoodUseTimeDilationMixin.java new file mode 100644 index 00000000..31dbcfb7 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/LivingEntityFoodUseTimeDilationMixin.java @@ -0,0 +1,30 @@ +package com.craisinlord.antarchy.mixins.time; + +import com.craisinlord.antarchy.content.time.TimeDilationApi; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(LivingEntity.class) +public abstract class LivingEntityFoodUseTimeDilationMixin { + @Shadow + protected abstract void updatingUsingItem(); + + @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;updatingUsingItem()V")) + private void antarchy$advanceFoodUse(LivingEntity entity) { + ItemStack stack = entity.getUseItem(); + if (stack.isEmpty() || stack.get(DataComponents.FOOD) == null) { + this.updatingUsingItem(); + return; + } + + int ticks = TimeDilationApi.consumeTicks(entity, "living_food_use"); + for (int i = 0; i < ticks && entity.isUsingItem(); i++) { + this.updatingUsingItem(); + } + } +} diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/PlayerCooldownTimeDilationMixin.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/PlayerCooldownTimeDilationMixin.java new file mode 100644 index 00000000..c6d51f93 --- /dev/null +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/mixins/time/PlayerCooldownTimeDilationMixin.java @@ -0,0 +1,20 @@ +package com.craisinlord.antarchy.mixins.time; + +import com.craisinlord.antarchy.content.time.TimeDilationApi; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemCooldowns; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(Player.class) +public abstract class PlayerCooldownTimeDilationMixin { + @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemCooldowns;tick()V")) + private void antarchy$advanceCooldowns(ItemCooldowns cooldowns) { + Player player = (Player) (Object) this; + int ticks = TimeDilationApi.consumeTicks(player, "player_item_cooldowns"); + for (int i = 0; i < ticks; i++) { + cooldowns.tick(); + } + } +} diff --git a/common-1.21.1/src/main/resources/antarchy-common.mixins.json b/common-1.21.1/src/main/resources/antarchy-common.mixins.json index 49e1cfe3..fa380f3f 100644 --- a/common-1.21.1/src/main/resources/antarchy-common.mixins.json +++ b/common-1.21.1/src/main/resources/antarchy-common.mixins.json @@ -95,7 +95,10 @@ "time.EndCrystalTimeDilationMixin", "time.LivingEntityTimeDilationMixin", "time.LivingEntityTimeDilationCleanupMixin", - "time.LivingEntityAttackCooldownTimeDilationMixin", + "time.LivingEntityAttackCooldownTimeDilationMixin", + "time.PlayerCooldownTimeDilationMixin", + "time.LivingEntityFoodUseTimeDilationMixin", + "time.LivingEntityChronosphereEquipmentMixin", "time.LookControlTimeDilationMixin", "time.MeleeAttackGoalTimeDilationMixin", "time.MobAttackTimeDilationMixin", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/animations/creeping_horror.animation.json b/common-1.21.1/src/main/resources/assets/antarchy/animations/crawling_blight.animation.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/animations/creeping_horror.animation.json rename to common-1.21.1/src/main/resources/assets/antarchy/animations/crawling_blight.animation.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/animations/triffid.animation.json b/common-1.21.1/src/main/resources/assets/antarchy/animations/flytrap.animation.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/animations/triffid.animation.json rename to common-1.21.1/src/main/resources/assets/antarchy/animations/flytrap.animation.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/animations/lurking_terror.animation.json b/common-1.21.1/src/main/resources/assets/antarchy/animations/skulking_fright.animation.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/animations/lurking_terror.animation.json rename to common-1.21.1/src/main/resources/assets/antarchy/animations/skulking_fright.animation.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/animations/jumpy_bug.animation.json b/common-1.21.1/src/main/resources/assets/antarchy/animations/springbug.animation.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/animations/jumpy_bug.animation.json rename to common-1.21.1/src/main/resources/assets/antarchy/animations/springbug.animation.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/animations/cloud_shark.animation.json b/common-1.21.1/src/main/resources/assets/antarchy/animations/stratoshark.animation.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/animations/cloud_shark.animation.json rename to common-1.21.1/src/main/resources/assets/antarchy/animations/stratoshark.animation.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/crawling_blight_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/crawling_blight_egg.json new file mode 100644 index 00000000..be0e9726 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/crawling_blight_egg.json @@ -0,0 +1,76 @@ +{ + "variants": { + "eggs=1,hatch=0": [ + { "model": "antarchy:block/crawling_blight_egg_1" }, + { "model": "antarchy:block/crawling_blight_egg_1", "y": 90 }, + { "model": "antarchy:block/crawling_blight_egg_1", "y": 180 }, + { "model": "antarchy:block/crawling_blight_egg_1", "y": 270 } + ], + "eggs=1,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_1" }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_1", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_1", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_1", "y": 270 } + ], + "eggs=1,hatch=2": [ + { "model": "antarchy:block/very_cracked_crawling_blight_egg_1" }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_1", "y": 90 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_1", "y": 180 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_1", "y": 270 } + ], + "eggs=2,hatch=0": [ + { "model": "antarchy:block/crawling_blight_egg_2" }, + { "model": "antarchy:block/crawling_blight_egg_2", "y": 90 }, + { "model": "antarchy:block/crawling_blight_egg_2", "y": 180 }, + { "model": "antarchy:block/crawling_blight_egg_2", "y": 270 } + ], + "eggs=2,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_2" }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_2", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_2", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_2", "y": 270 } + ], + "eggs=2,hatch=2": [ + { "model": "antarchy:block/very_cracked_crawling_blight_egg_2" }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_2", "y": 90 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_2", "y": 180 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_2", "y": 270 } + ], + "eggs=3,hatch=0": [ + { "model": "antarchy:block/crawling_blight_egg_3" }, + { "model": "antarchy:block/crawling_blight_egg_3", "y": 90 }, + { "model": "antarchy:block/crawling_blight_egg_3", "y": 180 }, + { "model": "antarchy:block/crawling_blight_egg_3", "y": 270 } + ], + "eggs=3,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_3" }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_3", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_3", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_3", "y": 270 } + ], + "eggs=3,hatch=2": [ + { "model": "antarchy:block/very_cracked_crawling_blight_egg_3" }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_3", "y": 90 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_3", "y": 180 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_3", "y": 270 } + ], + "eggs=4,hatch=0": [ + { "model": "antarchy:block/crawling_blight_egg_4" }, + { "model": "antarchy:block/crawling_blight_egg_4", "y": 90 }, + { "model": "antarchy:block/crawling_blight_egg_4", "y": 180 }, + { "model": "antarchy:block/crawling_blight_egg_4", "y": 270 } + ], + "eggs=4,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_4" }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_4", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_4", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_crawling_blight_egg_4", "y": 270 } + ], + "eggs=4,hatch=2": [ + { "model": "antarchy:block/very_cracked_crawling_blight_egg_4" }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_4", "y": 90 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_4", "y": 180 }, + { "model": "antarchy:block/very_cracked_crawling_blight_egg_4", "y": 270 } + ] + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/creeping_horror_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/creeping_horror_egg.json deleted file mode 100644 index 8611d9f0..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/creeping_horror_egg.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "eggs=1,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_1" }, - { "model": "antarchy:block/creeping_horror_egg_1", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_1", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_1", "y": 270 } - ], - "eggs=1,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_1", "y": 270 } - ], - "eggs=1,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_1", "y": 270 } - ], - "eggs=2,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_2" }, - { "model": "antarchy:block/creeping_horror_egg_2", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_2", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_2", "y": 270 } - ], - "eggs=2,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_2", "y": 270 } - ], - "eggs=2,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_2", "y": 270 } - ], - "eggs=3,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_3" }, - { "model": "antarchy:block/creeping_horror_egg_3", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_3", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_3", "y": 270 } - ], - "eggs=3,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_3", "y": 270 } - ], - "eggs=3,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_3", "y": 270 } - ], - "eggs=4,hatch=0": [ - { "model": "antarchy:block/creeping_horror_egg_4" }, - { "model": "antarchy:block/creeping_horror_egg_4", "y": 90 }, - { "model": "antarchy:block/creeping_horror_egg_4", "y": 180 }, - { "model": "antarchy:block/creeping_horror_egg_4", "y": 270 } - ], - "eggs=4,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4" }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_creeping_horror_egg_4", "y": 270 } - ], - "eggs=4,hatch=2": [ - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4" }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4", "y": 90 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4", "y": 180 }, - { "model": "antarchy:block/very_cracked_creeping_horror_egg_4", "y": 270 } - ] - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/flytrap_goo_block.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/flytrap_goo_block.json new file mode 100644 index 00000000..24b18afc --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/flytrap_goo_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "antarchy:block/flytrap_goo_block" + } + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/lurking_terror_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/lurking_terror_egg.json deleted file mode 100644 index dce79841..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/lurking_terror_egg.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "variants": { - "eggs=1,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_1" }, - { "model": "antarchy:block/lurking_terror_egg_1", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_1", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_1", "y": 270 } - ], - "eggs=1,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_1", "y": 270 } - ], - "eggs=1,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_1", "y": 270 } - ], - "eggs=2,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_2" }, - { "model": "antarchy:block/lurking_terror_egg_2", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_2", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_2", "y": 270 } - ], - "eggs=2,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_2", "y": 270 } - ], - "eggs=2,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_2", "y": 270 } - ], - "eggs=3,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_3" }, - { "model": "antarchy:block/lurking_terror_egg_3", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_3", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_3", "y": 270 } - ], - "eggs=3,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_3", "y": 270 } - ], - "eggs=3,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_3", "y": 270 } - ], - "eggs=4,hatch=0": [ - { "model": "antarchy:block/lurking_terror_egg_4" }, - { "model": "antarchy:block/lurking_terror_egg_4", "y": 90 }, - { "model": "antarchy:block/lurking_terror_egg_4", "y": 180 }, - { "model": "antarchy:block/lurking_terror_egg_4", "y": 270 } - ], - "eggs=4,hatch=1": [ - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4" }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4", "y": 90 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4", "y": 180 }, - { "model": "antarchy:block/slightly_cracked_lurking_terror_egg_4", "y": 270 } - ], - "eggs=4,hatch=2": [ - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4" }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4", "y": 90 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4", "y": 180 }, - { "model": "antarchy:block/very_cracked_lurking_terror_egg_4", "y": 270 } - ] - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/skulking_fright_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/skulking_fright_egg.json new file mode 100644 index 00000000..e7cbf512 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/skulking_fright_egg.json @@ -0,0 +1,76 @@ +{ + "variants": { + "eggs=1,hatch=0": [ + { "model": "antarchy:block/skulking_fright_egg_1" }, + { "model": "antarchy:block/skulking_fright_egg_1", "y": 90 }, + { "model": "antarchy:block/skulking_fright_egg_1", "y": 180 }, + { "model": "antarchy:block/skulking_fright_egg_1", "y": 270 } + ], + "eggs=1,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_1" }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_1", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_1", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_1", "y": 270 } + ], + "eggs=1,hatch=2": [ + { "model": "antarchy:block/very_cracked_skulking_fright_egg_1" }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_1", "y": 90 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_1", "y": 180 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_1", "y": 270 } + ], + "eggs=2,hatch=0": [ + { "model": "antarchy:block/skulking_fright_egg_2" }, + { "model": "antarchy:block/skulking_fright_egg_2", "y": 90 }, + { "model": "antarchy:block/skulking_fright_egg_2", "y": 180 }, + { "model": "antarchy:block/skulking_fright_egg_2", "y": 270 } + ], + "eggs=2,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_2" }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_2", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_2", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_2", "y": 270 } + ], + "eggs=2,hatch=2": [ + { "model": "antarchy:block/very_cracked_skulking_fright_egg_2" }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_2", "y": 90 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_2", "y": 180 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_2", "y": 270 } + ], + "eggs=3,hatch=0": [ + { "model": "antarchy:block/skulking_fright_egg_3" }, + { "model": "antarchy:block/skulking_fright_egg_3", "y": 90 }, + { "model": "antarchy:block/skulking_fright_egg_3", "y": 180 }, + { "model": "antarchy:block/skulking_fright_egg_3", "y": 270 } + ], + "eggs=3,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_3" }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_3", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_3", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_3", "y": 270 } + ], + "eggs=3,hatch=2": [ + { "model": "antarchy:block/very_cracked_skulking_fright_egg_3" }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_3", "y": 90 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_3", "y": 180 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_3", "y": 270 } + ], + "eggs=4,hatch=0": [ + { "model": "antarchy:block/skulking_fright_egg_4" }, + { "model": "antarchy:block/skulking_fright_egg_4", "y": 90 }, + { "model": "antarchy:block/skulking_fright_egg_4", "y": 180 }, + { "model": "antarchy:block/skulking_fright_egg_4", "y": 270 } + ], + "eggs=4,hatch=1": [ + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_4" }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_4", "y": 90 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_4", "y": 180 }, + { "model": "antarchy:block/slightly_cracked_skulking_fright_egg_4", "y": 270 } + ], + "eggs=4,hatch=2": [ + { "model": "antarchy:block/very_cracked_skulking_fright_egg_4" }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_4", "y": 90 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_4", "y": 180 }, + { "model": "antarchy:block/very_cracked_skulking_fright_egg_4", "y": 270 } + ] + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/jumpy_bug_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/springbug_egg.json similarity index 57% rename from common-1.21.1/src/main/resources/assets/antarchy/blockstates/jumpy_bug_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/blockstates/springbug_egg.json index 90df0736..ad413016 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/jumpy_bug_egg.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/springbug_egg.json @@ -1,18 +1,18 @@ { "variants": { "hanging=false,rotated=false": { - "model": "antarchy:block/jumpy_bug_egg" + "model": "antarchy:block/springbug_egg" }, "hanging=false,rotated=true": { - "model": "antarchy:block/jumpy_bug_egg", + "model": "antarchy:block/springbug_egg", "y": 90 }, "hanging=true,rotated=false": { - "model": "antarchy:block/jumpy_bug_egg", + "model": "antarchy:block/springbug_egg", "x": 180 }, "hanging=true,rotated=true": { - "model": "antarchy:block/jumpy_bug_egg", + "model": "antarchy:block/springbug_egg", "x": 180, "y": 90 } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/triffid_goo_block.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/triffid_goo_block.json deleted file mode 100644 index b6d986b6..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/triffid_goo_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "antarchy:block/triffid_goo_block" - } - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/undertrial_spawner.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/undertrial_spawner.json new file mode 100644 index 00000000..26f80971 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/undertrial_spawner.json @@ -0,0 +1,10 @@ +{ + "variants": { + "trial_spawner_state=inactive": {"model": "antarchy:block/undertrial_spawner_inactive", "x": 90}, + "trial_spawner_state=waiting_for_players": {"model": "antarchy:block/undertrial_spawner_inactive", "x": 90}, + "trial_spawner_state=active": {"model": "antarchy:block/undertrial_spawner_active", "x": 90}, + "trial_spawner_state=waiting_for_reward_ejection": {"model": "antarchy:block/undertrial_spawner_active", "x": 90}, + "trial_spawner_state=ejecting_reward": {"model": "antarchy:block/undertrial_spawner_ejecting_reward", "x": 90}, + "trial_spawner_state=cooldown": {"model": "antarchy:block/undertrial_spawner_inactive", "x": 90} + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/blockstates/undervault.json b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/undervault.json new file mode 100644 index 00000000..381a7e38 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/blockstates/undervault.json @@ -0,0 +1,28 @@ +{ + "variants": { + "vault_state=inactive,under_facing=north": {"model": "antarchy:block/undervault_off"}, + "vault_state=inactive,under_facing=south": {"model": "antarchy:block/undervault_off", "y": 180}, + "vault_state=inactive,under_facing=east": {"model": "antarchy:block/undervault_off", "y": 90}, + "vault_state=inactive,under_facing=west": {"model": "antarchy:block/undervault_off", "y": 270}, + "vault_state=inactive,under_facing=up": {"model": "antarchy:block/undervault_off", "x": 270}, + "vault_state=inactive,under_facing=down": {"model": "antarchy:block/undervault_off", "x": 90}, + "vault_state=active,under_facing=north": {"model": "antarchy:block/undervault_on"}, + "vault_state=active,under_facing=south": {"model": "antarchy:block/undervault_on", "y": 180}, + "vault_state=active,under_facing=east": {"model": "antarchy:block/undervault_on", "y": 90}, + "vault_state=active,under_facing=west": {"model": "antarchy:block/undervault_on", "y": 270}, + "vault_state=active,under_facing=up": {"model": "antarchy:block/undervault_on", "x": 270}, + "vault_state=active,under_facing=down": {"model": "antarchy:block/undervault_on", "x": 90}, + "vault_state=unlocking,under_facing=north": {"model": "antarchy:block/undervault_on"}, + "vault_state=unlocking,under_facing=south": {"model": "antarchy:block/undervault_on", "y": 180}, + "vault_state=unlocking,under_facing=east": {"model": "antarchy:block/undervault_on", "y": 90}, + "vault_state=unlocking,under_facing=west": {"model": "antarchy:block/undervault_on", "y": 270}, + "vault_state=unlocking,under_facing=up": {"model": "antarchy:block/undervault_on", "x": 270}, + "vault_state=unlocking,under_facing=down": {"model": "antarchy:block/undervault_on", "x": 90}, + "vault_state=ejecting,under_facing=north": {"model": "antarchy:block/undervault_ejecting"}, + "vault_state=ejecting,under_facing=south": {"model": "antarchy:block/undervault_ejecting", "y": 180}, + "vault_state=ejecting,under_facing=east": {"model": "antarchy:block/undervault_ejecting", "y": 90}, + "vault_state=ejecting,under_facing=west": {"model": "antarchy:block/undervault_ejecting", "y": 270}, + "vault_state=ejecting,under_facing=up": {"model": "antarchy:block/undervault_ejecting", "x": 270}, + "vault_state=ejecting,under_facing=down": {"model": "antarchy:block/undervault_ejecting", "x": 90} + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/geo/creeping_horror.geo.json b/common-1.21.1/src/main/resources/assets/antarchy/geo/crawling_blight.geo.json similarity index 99% rename from common-1.21.1/src/main/resources/assets/antarchy/geo/creeping_horror.geo.json rename to common-1.21.1/src/main/resources/assets/antarchy/geo/crawling_blight.geo.json index 22d0bcdf..b073dc1d 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/geo/creeping_horror.geo.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/geo/crawling_blight.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.creepinghorror", + "identifier": "geometry.crawlingblight", "texture_width": 256, "texture_height": 256, "visible_bounds_width": 9, diff --git a/common-1.21.1/src/main/resources/assets/antarchy/geo/triffid.geo.json b/common-1.21.1/src/main/resources/assets/antarchy/geo/flytrap.geo.json similarity index 99% rename from common-1.21.1/src/main/resources/assets/antarchy/geo/triffid.geo.json rename to common-1.21.1/src/main/resources/assets/antarchy/geo/flytrap.geo.json index 696e0a31..d8943375 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/geo/triffid.geo.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/geo/flytrap.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.triffid", + "identifier": "geometry.flytrap", "texture_width": 256, "texture_height": 256, "visible_bounds_width": 8, diff --git a/common-1.21.1/src/main/resources/assets/antarchy/geo/lurking_terror.geo.json b/common-1.21.1/src/main/resources/assets/antarchy/geo/skulking_fright.geo.json similarity index 99% rename from common-1.21.1/src/main/resources/assets/antarchy/geo/lurking_terror.geo.json rename to common-1.21.1/src/main/resources/assets/antarchy/geo/skulking_fright.geo.json index d42c4716..8468810c 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/geo/lurking_terror.geo.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/geo/skulking_fright.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.lurkingterror", + "identifier": "geometry.skulkingfright", "texture_width": 128, "texture_height": 128, "visible_bounds_width": 8, diff --git a/common-1.21.1/src/main/resources/assets/antarchy/geo/jumpy_bug.geo.json b/common-1.21.1/src/main/resources/assets/antarchy/geo/springbug.geo.json similarity index 99% rename from common-1.21.1/src/main/resources/assets/antarchy/geo/jumpy_bug.geo.json rename to common-1.21.1/src/main/resources/assets/antarchy/geo/springbug.geo.json index f6a76b20..5ee68df6 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/geo/jumpy_bug.geo.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/geo/springbug.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.jumpybug", + "identifier": "geometry.springbug", "texture_width": 512, "texture_height": 512, "visible_bounds_width": 10, diff --git a/common-1.21.1/src/main/resources/assets/antarchy/geo/cloud_shark.geo.json b/common-1.21.1/src/main/resources/assets/antarchy/geo/stratoshark.geo.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/geo/cloud_shark.geo.json rename to common-1.21.1/src/main/resources/assets/antarchy/geo/stratoshark.geo.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/de_de.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/de_de.json index f1414705..9eecf3e6 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/de_de.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/de_de.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "Blass Nyxite", "block.antarchy.nyxite_spike": "Nyxite-Stachel", "block.antarchy.potent_nyxite": "Potent Nyxite", - "block.antarchy.triffid_goo_block": "Triffid Schleim-Block", + "block.antarchy.flytrap_goo_block": "Flytrap Schleim-Block", "block.antarchy.elythia_portal": "Elythia-Portal", "block.antarchy.cloud_block": "Wolke-Block", "block.antarchy.thoraxis_portal": "Thoraxis-Portal", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "Regenbogen-Ameise", "entity.antarchy.diamond_minecart": "Die Diamantlore", "entity.antarchy.dr_trayaurus": "Dr. Trayaurus", - "entity.antarchy.cloud_shark": "Wolkenhai", + "entity.antarchy.stratoshark": "Wolkenhai", "entity.antarchy.kraken": "Der Kraken", "entity.antarchy.missile_squid": "Raketenkalmar", "entity.antarchy.octopus_bomb": "Oktopusbombe", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "Molevore", "entity.antarchy.mantis": "Gottesanbeterin", "entity.antarchy.alpha_mantis": "Alpha-Gottesanbeterin", - "entity.antarchy.triffid": "Triffid", + "entity.antarchy.flytrap": "Flytrap", "entity.antarchy.toreterror": "Toreterror", "entity.antarchy.water_bomb": "Wasserbombe", "subtitles.antarchy.mantis_ambient": "Gottesanbeterin klickt", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "Benimmhammer", "tooltip.antarchy.attitude_adjuster.grounded": "Schleudert Ziele am Boden nach oben; Ziele in der Luft werden auf den Boden geschmettert.", "tooltip.antarchy.attitude_adjuster.slam": "Rechtsklicke in der Luft, um auf den Boden zu schmettern.", - "item.antarchy.cloud_shark_fin": "Wolkenhai-Flosse", - "item.antarchy.cloud_shark_fin_soup": "Wolkenhai-Flosse-Suppe", - "tooltip.antarchy.cloud_shark_fin_soup": "Gewährt Stärke und Sanften Fall.", + "item.antarchy.stratoshark_fin": "Wolkenhai-Flosse", + "item.antarchy.stratoshark_fin_soup": "Wolkenhai-Flosse-Suppe", + "tooltip.antarchy.stratoshark_fin_soup": "Gewährt Stärke und Sanften Fall.", "tooltip.antarchy.critter_cage.empty": "Rechtsklick zum Werfen", "tooltip.antarchy.critter_cage.contains": "Enthält: %s", "tooltip.antarchy.critter_cage.release": "Rechtsklick zum Freilassen", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "Maximale Blutglasherzen", "item.antarchy.molevore_nose": "Molevore-Nase", "item.antarchy.moleworm": "Moleworm", - "item.antarchy.triffid_spawn_egg": "Triffid-Spawn-Ei", + "item.antarchy.flytrap_spawn_egg": "Flytrap-Spawn-Ei", "item.antarchy.infested_rooted_dirt": "Befallen Verwurzelt Erde", "item.antarchy.infested_coarse_dirt": "Befallen Grob Erde", "item.antarchy.pale_nyxite": "Blass Nyxite", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "König-Schuppe", "item.antarchy.queen_scale": "Königin-Schuppe", - "item.antarchy.jumpy_bug_leg": "Sprungkäfer-Bein", - "item.antarchy.jumpy_boots": "Sprungstiefel", - "tooltip.antarchy.jumpy_boots": "Schleiche zum Aufladen und springe dann, um nach oben zu schnellen.", + "item.antarchy.springbug_leg": "Sprungkäfer-Bein", + "item.antarchy.springy_boots": "Sprungstiefel", + "tooltip.antarchy.springy_boots": "Schleiche zum Aufladen und springe dann, um nach oben zu schnellen.", "item.antarchy.brutalfly_wing": "Brutalfly-Flügel", "item.antarchy.brutalfly_elytra": "Brutalfly-Elytren", "tooltip.antarchy.brutalfly_elytra.flap": "Halte beim Fliegen %s gedrückt, um mit den Flügeln zu schlagen", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "Amerikanisch: %s", "item.antarchy.root_beer": "Root Beer", "item.antarchy.primordial_scute": "Urzeitlich-Hornplatte", - "item.antarchy.triffid_goo": "Triffid Schleim", - "item.antarchy.triffid_goo_block": "Triffid Schleim-Block", - "tooltip.antarchy.triffid_goo_block": "Bei hoher Geschwindigkeit prallst du nach oben ab, andernfalls sinkst du hindurch.", + "item.antarchy.flytrap_goo": "Flytrap Schleim", + "item.antarchy.flytrap_goo_block": "Flytrap Schleim-Block", + "tooltip.antarchy.flytrap_goo_block": "Bei hoher Geschwindigkeit prallst du nach oben ab, andernfalls sinkst du hindurch.", "item.antarchy.cloud_bucket": "Wolke-Eimer", "tooltip.antarchy.cloud_bucket.midair": "Kann in der Luft platziert werden", "item.antarchy.lumen_bucket": "Lumen-Eimer", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "Raupe-Spawn-Ei", "item.antarchy.butterfly_spawn_egg": "Schmetterling-Spawn-Ei", "item.antarchy.brutalfly_spawn_egg": "Brutalfly-Spawn-Ei", - "item.antarchy.cloud_shark_spawn_egg": "Wolkenhai-Spawn-Ei", + "item.antarchy.stratoshark_spawn_egg": "Wolkenhai-Spawn-Ei", "item.antarchy.kraken_spawn_egg": "Äh, nein. Lass das.", "item.antarchy.missile_squid_spawn_egg": "Raketenkalmar-Spawn-Ei", "item.antarchy.octopus_bomb_spawn_egg": "Oktopusbombe-Spawn-Ei", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "Die Termite ist bereit, ihr Ziel zu öffnen.", "message.antarchy.termite_needs_reagent": "Diese Termite benötigt ein Reagenz, bevor sie ihr Ziel öffnen kann.", "death.attack.spit_bug_disrespect": "%1$s wurde vom Spuckkäfer respektlos behandelt", - "death.attack.jumpy_bug_jump": "%1$s wurde vom Sprungkäfer angesprungen", + "death.attack.springbug_jump": "%1$s wurde vom Sprungkäfer angesprungen", "death.attack.hercules_beetle_obliteration": "%1$s wurde vom Herkuleskäfer ausgelöscht", "message.antarchy.big_bertha.mode": "Big-Bertha-Modus: %s", "message.antarchy.big_bertha.mode.basilisk": "Basilisk", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "Wachstum", "effect.antarchy.bloodglass_ward": "Blutglasbarriere", "effect.antarchy.bloodglass_ward.description": "Verleiht Herzen, die zersplittern und einen gesamten Treffer absorbieren. Sie regenerieren sich mit der Zeit.", - "death.attack.triffid_mauling": "%1$s wurde von einer Pflanze zu Tode zerfleischt", - "death.attack.triffid_mauling.player": "%1$s wurde von einer Pflanze zu Tode zerfleischt", - "death.attack.triffid_swallow": "%1$s wurde von einem Triffid verschlungen", - "death.attack.triffid_swallow.player": "%1$s wurde von einem Triffid verschlungen", + "death.attack.flytrap_mauling": "%1$s wurde von einer Pflanze zu Tode zerfleischt", + "death.attack.flytrap_mauling.player": "%1$s wurde von einer Pflanze zu Tode zerfleischt", + "death.attack.flytrap_swallow": "%1$s wurde von einem Flytrap verschlungen", + "death.attack.flytrap_swallow.player": "%1$s wurde von einem Flytrap verschlungen", "potion.antarchy.haste": "Eiletrank", "potion.antarchy.strong_haste": "Starker Eiletrank", "tooltip.antarchy.big_bertha.mode": "Modus: %s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "Ameisen beißt", "subtitles.antarchy.ant_gather": "Ameisen sammeln", "subtitles.antarchy.ant_nest": "Ameisennest raschelt", - "subtitles.antarchy.cloud_shark_bite": "Wolkenhai beißt", - "subtitles.antarchy.cloud_shark_idle": "Wolkenhai ist zu hören", - "subtitles.antarchy.cloud_shark_hurt": "Wolkenhai wird verletzt", - "subtitles.antarchy.cloud_shark_death": "Wolkenhai stirbt", - "subtitles.antarchy.cloud_shark_fly": "Wolkenhai fliegt", + "subtitles.antarchy.stratoshark_bite": "Wolkenhai beißt", + "subtitles.antarchy.stratoshark_idle": "Wolkenhai ist zu hören", + "subtitles.antarchy.stratoshark_hurt": "Wolkenhai wird verletzt", + "subtitles.antarchy.stratoshark_death": "Wolkenhai stirbt", + "subtitles.antarchy.stratoshark_fly": "Wolkenhai fliegt", "subtitles.antarchy.caterpillar_idle": "Raupe ist zu hören", "subtitles.antarchy.caterpillar_hurt": "Raupe wird verletzt", "subtitles.antarchy.caterpillar_crawl": "Raupe kriecht", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "Albtraum stirbt", "subtitles.antarchy.nightmare_bite": "Albtraum beißt", "subtitles.antarchy.nightmare_flap": "Albtraum schlägt mit den Flügeln", - "subtitles.antarchy.triffid_attack": "Triffid greift an", - "subtitles.antarchy.triffid_grab": "Triffid packt zu", - "subtitles.antarchy.triffid_hurt": "Triffid wird verletzt", - "subtitles.antarchy.triffid_death": "Triffid stirbt", - "subtitles.antarchy.triffid_hiss": "Triffid zischt", - "subtitles.antarchy.triffid_growl": "Triffid knurrt", + "subtitles.antarchy.flytrap_attack": "Flytrap greift an", + "subtitles.antarchy.flytrap_grab": "Flytrap packt zu", + "subtitles.antarchy.flytrap_hurt": "Flytrap wird verletzt", + "subtitles.antarchy.flytrap_death": "Flytrap stirbt", + "subtitles.antarchy.flytrap_hiss": "Flytrap zischt", + "subtitles.antarchy.flytrap_growl": "Flytrap knurrt", "subtitles.antarchy.gravity_gun_pickup": "Gravitationskanone hebt etwas auf", "subtitles.antarchy.gravity_gun_drop": "Gravitationskanone lässt los", "subtitles.antarchy.gravity_gun_hold_loop": "Gravitationskanone summt", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "Bernsteinflechte", "block.antarchy.bile_vein": "Gallenader", "block.antarchy.creepvine": "Creepvine", - "block.antarchy.creeping_horror_egg": "Kriechender Schrecken-Ei", - "block.antarchy.lurking_terror_egg": "Lauernder Terror-Ei", + "block.antarchy.crawling_blight_egg": "Kriechender Schrecken-Ei", + "block.antarchy.skulking_fright_egg": "Lauernder Terror-Ei", "entity.antarchy.termite": "Termite", - "entity.antarchy.jumpy_bug": "Sprungkäfer", + "entity.antarchy.springbug": "Sprungkäfer", "entity.antarchy.spit_bug": "Spuckkäfer", "entity.antarchy.stink_bug": "Stinkwanze", "entity.antarchy.rolly_polly": "Rollassel", - "entity.antarchy.creeping_horror": "Kriechender Schrecken", - "entity.antarchy.lurking_terror": "Lauernder Terror", + "entity.antarchy.crawling_blight": "Kriechender Schrecken", + "entity.antarchy.skulking_fright": "Lauernder Terror", "entity.antarchy.hercules_beetle": "Herkuleskäfer", - "item.antarchy.jumpy_bug_spawn_egg": "Sprungkäfer-Spawn-Ei", + "item.antarchy.springbug_spawn_egg": "Sprungkäfer-Spawn-Ei", "item.antarchy.spit_bug_spawn_egg": "Spuckkäfer-Spawn-Ei", "item.antarchy.stink_bug_spawn_egg": "Stinkwanze-Spawn-Ei", "item.antarchy.termite_spawn_egg": "Termite-Spawn-Ei", "item.antarchy.rolly_polly_spawn_egg": "Rollassel-Spawn-Ei", - "item.antarchy.creeping_horror_spawn_egg": "Kriechender Schrecken-Spawn-Ei", - "item.antarchy.lurking_terror_spawn_egg": "Lauernder Terror-Spawn-Ei", + "item.antarchy.crawling_blight_spawn_egg": "Kriechender Schrecken-Spawn-Ei", + "item.antarchy.skulking_fright_spawn_egg": "Lauernder Terror-Spawn-Ei", "item.antarchy.hercules_beetle_spawn_egg": "Herkuleskäfer-Spawn-Ei", "item.antarchy.chitin": "Chitin", "block.antarchy.polished_broodstone": "Poliert Broodstone", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "Leuchtkappenpilzblock", "block.antarchy.molting_vines": "Häutungsranken", "item.antarchy.broodfruit": "Brutfrucht", - "block.antarchy.jumpy_bug_egg": "Sprungkäfer-Ei", - "subtitles.antarchy.creeping_horror_growl": "Kriechender Schrecken knurrt", - "subtitles.antarchy.creeping_horror_hurt": "Kriechender Schrecken wird verletzt", - "subtitles.antarchy.creeping_horror_bite": "Kriechender Schrecken beißt", - "subtitles.antarchy.lurking_terror_snarl": "Lauernder Terror faucht", - "subtitles.antarchy.lurking_terror_hurt": "Lauernder Terror wird verletzt", - "subtitles.antarchy.lurking_terror_bite": "Lauernder Terror beißt", - "subtitles.antarchy.lurking_terror_fly_loop": "Lauernder Terror fliegt", + "block.antarchy.springbug_egg": "Sprungkäfer-Ei", + "subtitles.antarchy.crawling_blight_growl": "Kriechender Schrecken knurrt", + "subtitles.antarchy.crawling_blight_hurt": "Kriechender Schrecken wird verletzt", + "subtitles.antarchy.crawling_blight_bite": "Kriechender Schrecken beißt", + "subtitles.antarchy.skulking_fright_snarl": "Lauernder Terror faucht", + "subtitles.antarchy.skulking_fright_hurt": "Lauernder Terror wird verletzt", + "subtitles.antarchy.skulking_fright_bite": "Lauernder Terror beißt", + "subtitles.antarchy.skulking_fright_fly_loop": "Lauernder Terror fliegt", "subtitles.antarchy.stink_bug_fart": "Stinkwanze furzt", "subtitles.antarchy.stink_bug_idle": "Stinkwanze ist zu hören", "subtitles.antarchy.rolly_polly_idle": "Rollassel ist zu hören", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "Jerry wird verletzt", "subtitles.antarchy.jerry_death": "Jerry stirbt", "subtitles.antarchy.jerry_attack": "Jerry greift an", - "subtitles.antarchy.jumpy_bug_idle": "Sprungkäfer ist zu hören", + "subtitles.antarchy.springbug_idle": "Sprungkäfer ist zu hören", "subtitles.antarchy.spit_bug_idle": "Spuckkäfer ist zu hören", - "subtitles.antarchy.jumpy_bug_hurt": "Sprungkäfer wird verletzt", - "subtitles.antarchy.jumpy_bug_jump": "Sprungkäfer springt", + "subtitles.antarchy.springbug_hurt": "Sprungkäfer wird verletzt", + "subtitles.antarchy.springbug_jump": "Sprungkäfer springt", "subtitles.antarchy.spit_bug_hurt": "Spuckkäfer wird verletzt", "subtitles.antarchy.spit_bug_spit": "Spuckkäfer spuckt", "subtitles.antarchy.brutalfly_spit": "Brutalfly spuckt", 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 b9d4c043..789f75e1 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 @@ -115,6 +115,9 @@ "block.antarchy.giant_lily_pad": "Giant Lily Pad", "block.antarchy.seashell": "Seashell", "block.antarchy.lucid_anchor": "Lucid Anchor", + "block.antarchy.undertrial_spawner": "Undertrial Spawner", + "block.antarchy.undervault": "Undervault", + "item.antarchy.undertrial_key": "Undertrial Key", "block.antarchy.critter_cage_block": "Critter Cage", "block.antarchy.hushweed": "Hushweed", "block.antarchy.umbral_moss_block": "Umbral Moss Block", @@ -163,7 +166,7 @@ "block.antarchy.pale_nyxite": "Pale Nyxite", "block.antarchy.nyxite_spike": "Nyxite Spike", "block.antarchy.potent_nyxite": "Potent Nyxite", - "block.antarchy.triffid_goo_block": "Triffid Goo Block", + "block.antarchy.flytrap_goo_block": "Flytrap Goo Block", "block.antarchy.elythia_portal": "Elythia Portal", "block.antarchy.cloud_block": "Cloud Block", "block.antarchy.thoraxis_portal": "Thoraxis Portal", @@ -293,7 +296,7 @@ "entity.antarchy.rainbow_ant": "Rainbow Ant", "entity.antarchy.diamond_minecart": "The Diamond Minecart", "entity.antarchy.dr_trayaurus": "Dr. Trayaurus", - "entity.antarchy.cloud_shark": "Cloud Shark", + "entity.antarchy.stratoshark": "Stratoshark", "entity.antarchy.kraken": "The Kraken", "entity.antarchy.missile_squid": "Missile Squid", "entity.antarchy.octopus_bomb": "Octopus Bomb", @@ -306,7 +309,7 @@ "entity.antarchy.molevore": "Molevore", "entity.antarchy.mantis": "Mantis", "entity.antarchy.alpha_mantis": "Alpha Mantis", - "entity.antarchy.triffid": "Triffid", + "entity.antarchy.flytrap": "Flytrap", "entity.antarchy.toreterror": "Toreterror", "entity.antarchy.water_bomb": "Water Bomb", "subtitles.antarchy.mantis_ambient": "Mantis clicks", @@ -326,9 +329,9 @@ "item.antarchy.attitude_adjuster": "Attitude Adjuster", "tooltip.antarchy.attitude_adjuster.grounded": "Smashes targets on the ground upward, targets in the air slam onto the ground.", "tooltip.antarchy.attitude_adjuster.slam": "Use while airborne to ground slam.", - "item.antarchy.cloud_shark_fin": "Cloud Shark Fin", - "item.antarchy.cloud_shark_fin_soup": "Cloud Shark Fin Soup", - "tooltip.antarchy.cloud_shark_fin_soup": "Grants Strength and Slow Falling.", + "item.antarchy.stratoshark_fin": "Stratoshark Fin", + "item.antarchy.stratoshark_fin_soup": "Stratoshark Fin Soup", + "tooltip.antarchy.stratoshark_fin_soup": "Grants Strength and Slow Falling.", "tooltip.antarchy.critter_cage.empty": "Use to throw", "tooltip.antarchy.critter_cage.contains": "Contains: %s", "tooltip.antarchy.critter_cage.release": "Use to release", @@ -401,7 +404,7 @@ "item.antarchy.worm_hook": "Worm Hook", "tooltip.antarchy.worm_hook.throw": "Right-click a block to fire and attach", "tooltip.antarchy.worm_hook.reel": "Sneak to reel in, right-click again to detach", - "item.antarchy.triffid_spawn_egg": "Triffid Spawn Egg", + "item.antarchy.flytrap_spawn_egg": "Flytrap Spawn Egg", "item.antarchy.infested_rooted_dirt": "Infested Rooted Dirt", "item.antarchy.infested_coarse_dirt": "Infested Coarse Dirt", "item.antarchy.pale_nyxite": "Pale Nyxite", @@ -556,9 +559,9 @@ "tooltip.antarchy.jerry_nucleus.hatch": "While holding, interact with any bug egg or turtle egg to hatch it instantly.", "key.antarchy.mount_special": "Mount: Special / Charge", "key.antarchy.mount_flight_toggle": "Mount: Toggle Flight", - "item.antarchy.jumpy_bug_leg": "Jumpy Bug Leg", - "item.antarchy.jumpy_boots": "Jumpy Boots", - "tooltip.antarchy.jumpy_boots": "Sneak to charge, then jump to spring upward.", + "item.antarchy.springbug_leg": "Springbug Leg", + "item.antarchy.springy_boots": "Springy Boots", + "tooltip.antarchy.springy_boots": "Sneak to charge, then jump to spring upward.", "item.antarchy.brutalfly_wing": "Brutalfly Wing", "item.antarchy.brutalfly_elytra": "Brutalfly Elytra", "item.antarchy.manticore_wing": "Manticore Wing", @@ -576,9 +579,9 @@ "item.antarchy.american_name": "American %s", "item.antarchy.root_beer": "Root Beer", "item.antarchy.primordial_scute": "Primordial Scute", - "item.antarchy.triffid_goo": "Triffid Goo", - "item.antarchy.triffid_goo_block": "Triffid Goo Block", - "tooltip.antarchy.triffid_goo_block": "At high velocity bounce up, otherwise sink through.", + "item.antarchy.flytrap_goo": "Flytrap Goo", + "item.antarchy.flytrap_goo_block": "Flytrap Goo Block", + "tooltip.antarchy.flytrap_goo_block": "At high velocity bounce up, otherwise sink through.", "item.antarchy.cloud_bucket": "Cloud Bucket", "tooltip.antarchy.cloud_bucket.midair": "Can be placed midair", "item.antarchy.lumen_bucket": "Lumen Bucket", @@ -690,7 +693,7 @@ "item.antarchy.caterpillar_spawn_egg": "Caterpillar Spawn Egg", "item.antarchy.butterfly_spawn_egg": "Butterfly Spawn Egg", "item.antarchy.brutalfly_spawn_egg": "Brutalfly Spawn Egg", - "item.antarchy.cloud_shark_spawn_egg": "Cloud Shark Spawn Egg", + "item.antarchy.stratoshark_spawn_egg": "Stratoshark Spawn Egg", "item.antarchy.kraken_spawn_egg": "Uh, no. Don\u0027t.", "item.antarchy.missile_squid_spawn_egg": "Missile Squid Spawn Egg", "item.antarchy.octopus_bomb_spawn_egg": "Octopus Bomb Spawn Egg", @@ -731,7 +734,7 @@ "message.antarchy.termite_activated": "The termite is ready to open its destination.", "message.antarchy.termite_needs_reagent": "This termite needs a reagent before it can open its destination.", "death.attack.spit_bug_disrespect": "%1$s was disrespected by Spit Bug", - "death.attack.jumpy_bug_jump": "%1$s was jumped by Jumpy Bug", + "death.attack.springbug_jump": "%1$s was jumped by Springbug", "death.attack.hercules_beetle_obliteration": "%1$s was obliterated by Hercules Beetle", "message.antarchy.big_bertha.mode": "Big Bertha Mode: %s", "message.antarchy.big_bertha.mode.none": "None", @@ -770,10 +773,10 @@ "effect.antarchy.bloodglass_ward.description": "Gives hearts that shatter, absorbing an entire hit of damage. They regenerate over time.", "effect.antarchy.glimmering": "Glimmering", "effect.antarchy.glimmering.description": "Passes through entities and attacks unharmed, like a spirit. Grants a lighter step and a higher jump.", - "death.attack.triffid_mauling": "%1$s was mauled to death by a plant", - "death.attack.triffid_mauling.player": "%1$s was mauled to death by a plant", - "death.attack.triffid_swallow": "%1$s was swallowed by a triffid", - "death.attack.triffid_swallow.player": "%1$s was swallowed by a triffid", + "death.attack.flytrap_mauling": "%1$s was mauled to death by a plant", + "death.attack.flytrap_mauling.player": "%1$s was mauled to death by a plant", + "death.attack.flytrap_swallow": "%1$s was swallowed by a flytrap", + "death.attack.flytrap_swallow.player": "%1$s was swallowed by a flytrap", "potion.antarchy.haste": "Haste Potion", "potion.antarchy.strong_haste": "Strong Haste Potion", "tooltip.antarchy.big_bertha.mode": "Mode: %s", @@ -833,11 +836,11 @@ "advancements.antarchy.davy_jones_locker.title": "Davy Jones\u0027 Locker", "advancements.antarchy.davy_jones_locker.description": "Defeat the Kraken.", "advancements.antarchy.shark_weak.title": "When Sharks Fly", - "advancements.antarchy.shark_weak.description": "Defeat a Cloud Shark.", + "advancements.antarchy.shark_weak.description": "Defeat a Stratoshark.", "advancements.antarchy.dont_let_the_bed_bugs_bite.title": "Don\u0027t Let the Bed Bugs Bite", "advancements.antarchy.dont_let_the_bed_bugs_bite.description": "Defeat a Bed Bug.", "advancements.antarchy.soups_up.title": "Soups Up", - "advancements.antarchy.soups_up.description": "Eat Cloud Shark Fin Soup.", + "advancements.antarchy.soups_up.description": "Eat Stratoshark Fin Soup.", "advancements.antarchy.in_the_upside_down.title": "In the Upside Down", "advancements.antarchy.in_the_upside_down.description": "Become inverted for the first time.", "advancements.antarchy.whoever_smelt_it_dealt_it.title": "Whoever smelt it, dealt it", @@ -906,11 +909,11 @@ "subtitles.antarchy.ant_bite": "Ants bite", "subtitles.antarchy.ant_gather": "Ants gather", "subtitles.antarchy.ant_nest": "Ant nest rustles", - "subtitles.antarchy.cloud_shark_bite": "Cloud Shark bites", - "subtitles.antarchy.cloud_shark_idle": "Cloud Shark idles", - "subtitles.antarchy.cloud_shark_hurt": "Cloud Shark hurts", - "subtitles.antarchy.cloud_shark_death": "Cloud Shark dies", - "subtitles.antarchy.cloud_shark_fly": "Cloud Shark flies", + "subtitles.antarchy.stratoshark_bite": "Stratoshark bites", + "subtitles.antarchy.stratoshark_idle": "Stratoshark idles", + "subtitles.antarchy.stratoshark_hurt": "Stratoshark hurts", + "subtitles.antarchy.stratoshark_death": "Stratoshark dies", + "subtitles.antarchy.stratoshark_fly": "Stratoshark flies", "subtitles.antarchy.caterpillar_idle": "Caterpillar idles", "subtitles.antarchy.caterpillar_hurt": "Caterpillar hurts", "subtitles.antarchy.caterpillar_crawl": "Caterpillar crawls", @@ -954,12 +957,12 @@ "subtitles.antarchy.nightmare_death": "Nightmare dies", "subtitles.antarchy.nightmare_bite": "Nightmare bites", "subtitles.antarchy.nightmare_flap": "Nightmare flaps", - "subtitles.antarchy.triffid_attack": "Triffid attacks", - "subtitles.antarchy.triffid_grab": "Triffid grabs", - "subtitles.antarchy.triffid_hurt": "Triffid hurts", - "subtitles.antarchy.triffid_death": "Triffid dies", - "subtitles.antarchy.triffid_hiss": "Triffid hisses", - "subtitles.antarchy.triffid_growl": "Triffid growls", + "subtitles.antarchy.flytrap_attack": "Flytrap attacks", + "subtitles.antarchy.flytrap_grab": "Flytrap grabs", + "subtitles.antarchy.flytrap_hurt": "Flytrap hurts", + "subtitles.antarchy.flytrap_death": "Flytrap dies", + "subtitles.antarchy.flytrap_hiss": "Flytrap hisses", + "subtitles.antarchy.flytrap_growl": "Flytrap growls", "subtitles.antarchy.gravity_gun_pickup": "Gravity Gun picks up", "subtitles.antarchy.gravity_gun_drop": "Gravity Gun drops", "subtitles.antarchy.gravity_gun_hold_loop": "Gravity Gun hums", @@ -1222,15 +1225,15 @@ "tooltip.antarchy.mucus_slippery": "Makes the block it's on even more slippery than ice", "block.antarchy.bile_vein": "Bile Vein", "block.antarchy.creepvine": "Creepvine", - "block.antarchy.creeping_horror_egg": "Creeping Horror Egg", - "block.antarchy.lurking_terror_egg": "Lurking Terror Egg", + "block.antarchy.crawling_blight_egg": "Crawling Blight Egg", + "block.antarchy.skulking_fright_egg": "Skulking Fright Egg", "entity.antarchy.termite": "Termite", - "entity.antarchy.jumpy_bug": "Jumpy Bug", + "entity.antarchy.springbug": "Springbug", "entity.antarchy.spit_bug": "Spit Bug", "entity.antarchy.stink_bug": "Stink Bug", "entity.antarchy.rolly_polly": "Rolly Polly", - "entity.antarchy.creeping_horror": "Creeping Horror", - "entity.antarchy.lurking_terror": "Lurking Terror", + "entity.antarchy.crawling_blight": "Crawling Blight", + "entity.antarchy.skulking_fright": "Skulking Fright", "entity.antarchy.hercules_beetle": "Hercules Beetle", "entity.antarchy.prince": "Prince", "entity.antarchy.princess": "Princess", @@ -1241,13 +1244,13 @@ "entity.antarchy.royal_bolt": "Royal Bolt", "block.antarchy.prince_egg": "Prince Egg", "block.antarchy.princess_egg": "Princess Egg", - "item.antarchy.jumpy_bug_spawn_egg": "Jumpy Bug Spawn Egg", + "item.antarchy.springbug_spawn_egg": "Springbug Spawn Egg", "item.antarchy.spit_bug_spawn_egg": "Spit Bug Spawn Egg", "item.antarchy.stink_bug_spawn_egg": "Stink Bug Spawn Egg", "item.antarchy.termite_spawn_egg": "Termite Spawn Egg", "item.antarchy.rolly_polly_spawn_egg": "Rolly Polly Spawn Egg", - "item.antarchy.creeping_horror_spawn_egg": "Creeping Horror Spawn Egg", - "item.antarchy.lurking_terror_spawn_egg": "Lurking Terror Spawn Egg", + "item.antarchy.crawling_blight_spawn_egg": "Crawling Blight Spawn Egg", + "item.antarchy.skulking_fright_spawn_egg": "Skulking Fright Spawn Egg", "item.antarchy.hercules_beetle_spawn_egg": "Hercules Beetle Spawn Egg", "item.antarchy.king_spawn_egg": "King Spawn Egg", "item.antarchy.queen_spawn_egg": "Queen Spawn Egg", @@ -1280,7 +1283,7 @@ "block.antarchy.glowcap_mushroom_block": "Glowcap Mushroom Block", "block.antarchy.molting_vines": "Molting Vines", "item.antarchy.broodfruit": "Broodfruit", - "block.antarchy.jumpy_bug_egg": "Jumpy Bug Egg", + "block.antarchy.springbug_egg": "Springbug Egg", "block.antarchy.spit_bug_egg": "Spit Bug Egg", "block.antarchy.jerry_egg": "Jerry Egg", "entity.antarchy.jerry": "Jerry", @@ -1290,13 +1293,13 @@ "block.antarchy.biowart": "Biowart", "block.antarchy.biowart_tendrils": "Biowart Tendrils", "biome.antarchy.biowart_caves": "Biowart Caves", - "subtitles.antarchy.creeping_horror_growl": "Creeping Horror growls", - "subtitles.antarchy.creeping_horror_hurt": "Creeping Horror hurts", - "subtitles.antarchy.creeping_horror_bite": "Creeping Horror bites", - "subtitles.antarchy.lurking_terror_snarl": "Lurking Terror snarls", - "subtitles.antarchy.lurking_terror_hurt": "Lurking Terror hurts", - "subtitles.antarchy.lurking_terror_bite": "Lurking Terror bites", - "subtitles.antarchy.lurking_terror_fly_loop": "Lurking Terror flies", + "subtitles.antarchy.crawling_blight_growl": "Crawling Blight growls", + "subtitles.antarchy.crawling_blight_hurt": "Crawling Blight hurts", + "subtitles.antarchy.crawling_blight_bite": "Crawling Blight bites", + "subtitles.antarchy.skulking_fright_snarl": "Skulking Fright snarls", + "subtitles.antarchy.skulking_fright_hurt": "Skulking Fright hurts", + "subtitles.antarchy.skulking_fright_bite": "Skulking Fright bites", + "subtitles.antarchy.skulking_fright_fly_loop": "Skulking Fright flies", "subtitles.antarchy.stink_bug_fart": "Stink Bug farts", "subtitles.antarchy.cavaryn_heartbeat": "Cavaryn pulses", "subtitles.antarchy.stink_bug_idle": "Stink Bug idles", @@ -1310,10 +1313,10 @@ "subtitles.antarchy.hercules_beetle_cry": "Hercules Beetle roars", "subtitles.antarchy.hercules_beetle_charge_start": "Hercules Beetle charges up", "subtitles.antarchy.hercules_beetle_knocked_down": "Hercules Beetle is knocked down", - "subtitles.antarchy.jumpy_bug_idle": "Jumpy Bug idles", + "subtitles.antarchy.springbug_idle": "Springbug idles", "subtitles.antarchy.spit_bug_idle": "Spit Bug idles", - "subtitles.antarchy.jumpy_bug_hurt": "Jumpy Bug hurts", - "subtitles.antarchy.jumpy_bug_jump": "Jumpy Bug jumps", + "subtitles.antarchy.springbug_hurt": "Springbug hurts", + "subtitles.antarchy.springbug_jump": "Springbug jumps", "subtitles.antarchy.spit_bug_hurt": "Spit Bug hurts", "subtitles.antarchy.spit_bug_spit": "Spit Bug spits", "subtitles.antarchy.brutalfly_spit": "Brutalfly spits", @@ -1432,4 +1435,6 @@ ,"decree.antarchy.show_no_mercy": "SHOW NO MERCY" ,"decree.antarchy.show_no_mercy.subtitle": "Keep dealing damage." ,"menu.antarchy.royal_judgment": "Royal Judgment" + ,"enchantment.antarchy.feather_rising": "Feather Rising" + ,"enchantment.antarchy.chronosphere": "Chronosphere" } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/es_es.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/es_es.json index ea1c6e7d..dd76c4b6 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/es_es.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/es_es.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "Nyxite pálido", "block.antarchy.nyxite_spike": "Púa de Nyxite", "block.antarchy.potent_nyxite": "Nyxite potente", - "block.antarchy.triffid_goo_block": "Bloque de Triffid Baba", + "block.antarchy.flytrap_goo_block": "Bloque de Flytrap Baba", "block.antarchy.elythia_portal": "Portal de Elythia", "block.antarchy.cloud_block": "Bloque de Nube", "block.antarchy.thoraxis_portal": "Portal de Thoraxis", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "Hormiga arcoíris", "entity.antarchy.diamond_minecart": "La vagoneta de diamante", "entity.antarchy.dr_trayaurus": "Dr. Trayaurus", - "entity.antarchy.cloud_shark": "Tiburón de nube", + "entity.antarchy.stratoshark": "Tiburón de nube", "entity.antarchy.kraken": "El Kraken", "entity.antarchy.missile_squid": "Calamar misil", "entity.antarchy.octopus_bomb": "Bomba pulpo", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "Molevore", "entity.antarchy.mantis": "Mantis", "entity.antarchy.alpha_mantis": "Mantis alfa", - "entity.antarchy.triffid": "Triffid", + "entity.antarchy.flytrap": "Flytrap", "entity.antarchy.toreterror": "Toreterror", "entity.antarchy.water_bomb": "Bomba de agua", "subtitles.antarchy.mantis_ambient": "Mantis hace clics", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "Ajustador de actitud", "tooltip.antarchy.attitude_adjuster.grounded": "Lanza hacia arriba a los objetivos en el suelo y estrella contra el suelo a los que están en el aire.", "tooltip.antarchy.attitude_adjuster.slam": "Haz clic derecho en el aire para realizar un golpe contra el suelo.", - "item.antarchy.cloud_shark_fin": "Aleta de Tiburón de nube", - "item.antarchy.cloud_shark_fin_soup": "Sopa de Aleta de Tiburón de nube", - "tooltip.antarchy.cloud_shark_fin_soup": "Otorga Fuerza y Caída lenta.", + "item.antarchy.stratoshark_fin": "Aleta de Tiburón de nube", + "item.antarchy.stratoshark_fin_soup": "Sopa de Aleta de Tiburón de nube", + "tooltip.antarchy.stratoshark_fin_soup": "Otorga Fuerza y Caída lenta.", "tooltip.antarchy.critter_cage.empty": "Clic derecho para lanzar", "tooltip.antarchy.critter_cage.contains": "Contiene: %s", "tooltip.antarchy.critter_cage.release": "Clic derecho para liberar", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "Máximo de Corazones de Cristalsangre", "item.antarchy.molevore_nose": "Nariz de Molevore", "item.antarchy.moleworm": "Moleworm", - "item.antarchy.triffid_spawn_egg": "Huevo generador de Triffid", + "item.antarchy.flytrap_spawn_egg": "Huevo generador de Flytrap", "item.antarchy.infested_rooted_dirt": "Enraizada Tierra infestado", "item.antarchy.infested_coarse_dirt": "Estéril Tierra infestado", "item.antarchy.pale_nyxite": "Nyxite pálido", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "Escama de Rey", "item.antarchy.queen_scale": "Escama de Reina", - "item.antarchy.jumpy_bug_leg": "Pata de Bicho saltarín", - "item.antarchy.jumpy_boots": "Botas saltarinas", - "tooltip.antarchy.jumpy_boots": "Agáchate para cargar y luego salta para impulsarte hacia arriba.", + "item.antarchy.springbug_leg": "Pata de Bicho saltarín", + "item.antarchy.springy_boots": "Botas saltarinas", + "tooltip.antarchy.springy_boots": "Agáchate para cargar y luego salta para impulsarte hacia arriba.", "item.antarchy.brutalfly_wing": "Ala de Brutalfly", "item.antarchy.brutalfly_elytra": "Élitros de Brutalfly", "tooltip.antarchy.brutalfly_elytra.flap": "Mientras vuelas, mantén %s para batir las alas", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "%s americano", "item.antarchy.root_beer": "Cerveza de raíz", "item.antarchy.primordial_scute": "Escama de Primordial", - "item.antarchy.triffid_goo": "Triffid Baba", - "item.antarchy.triffid_goo_block": "Bloque de Triffid Baba", - "tooltip.antarchy.triffid_goo_block": "A gran velocidad rebotas hacia arriba; de lo contrario, te hundes.", + "item.antarchy.flytrap_goo": "Flytrap Baba", + "item.antarchy.flytrap_goo_block": "Bloque de Flytrap Baba", + "tooltip.antarchy.flytrap_goo_block": "A gran velocidad rebotas hacia arriba; de lo contrario, te hundes.", "item.antarchy.cloud_bucket": "Cubo de Nube", "tooltip.antarchy.cloud_bucket.midair": "Se puede colocar en el aire", "item.antarchy.lumen_bucket": "Cubo de Lumen", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "Huevo generador de Oruga", "item.antarchy.butterfly_spawn_egg": "Huevo generador de Mariposa", "item.antarchy.brutalfly_spawn_egg": "Huevo generador de Brutalfly", - "item.antarchy.cloud_shark_spawn_egg": "Huevo generador de Tiburón de nube", + "item.antarchy.stratoshark_spawn_egg": "Huevo generador de Tiburón de nube", "item.antarchy.kraken_spawn_egg": "Eh, no. No lo hagas.", "item.antarchy.missile_squid_spawn_egg": "Huevo generador de Calamar misil", "item.antarchy.octopus_bomb_spawn_egg": "Huevo generador de Bomba pulpo", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "La termita está lista para abrir su destino.", "message.antarchy.termite_needs_reagent": "Esta termita necesita un reactivo antes de poder abrir su destino.", "death.attack.spit_bug_disrespect": "El bicho escupidor le faltó al respeto a %1$s", - "death.attack.jumpy_bug_jump": "El bicho saltarín saltó sobre %1$s", + "death.attack.springbug_jump": "El bicho saltarín saltó sobre %1$s", "death.attack.hercules_beetle_obliteration": "El escarabajo hércules aniquiló a %1$s", "message.antarchy.big_bertha.mode": "Modo de Gran Bertha: %s", "message.antarchy.big_bertha.mode.basilisk": "Basilisco", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "Crecimiento", "effect.antarchy.bloodglass_ward": "Guardia de Cristalsangre", "effect.antarchy.bloodglass_ward.description": "Otorga corazones que se hacen añicos y absorben un golpe completo de daño. Se regeneran con el tiempo.", - "death.attack.triffid_mauling": "Una planta despedazó a %1$s", - "death.attack.triffid_mauling.player": "Una planta despedazó a %1$s", - "death.attack.triffid_swallow": "Un Triffid se tragó a %1$s", - "death.attack.triffid_swallow.player": "Un Triffid se tragó a %1$s", + "death.attack.flytrap_mauling": "Una planta despedazó a %1$s", + "death.attack.flytrap_mauling.player": "Una planta despedazó a %1$s", + "death.attack.flytrap_swallow": "Un Flytrap se tragó a %1$s", + "death.attack.flytrap_swallow.player": "Un Flytrap se tragó a %1$s", "potion.antarchy.haste": "Poción de Prisa", "potion.antarchy.strong_haste": "Poción de Prisa fuerte", "tooltip.antarchy.big_bertha.mode": "Modo: %s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "Hormigas muerden", "subtitles.antarchy.ant_gather": "Hormigas recolectan", "subtitles.antarchy.ant_nest": "Nido de hormigas cruje", - "subtitles.antarchy.cloud_shark_bite": "Tiburón de nube muerde", - "subtitles.antarchy.cloud_shark_idle": "Tiburón de nube hace ruido", - "subtitles.antarchy.cloud_shark_hurt": "Tiburón de nube recibe daño", - "subtitles.antarchy.cloud_shark_death": "Tiburón de nube muere", - "subtitles.antarchy.cloud_shark_fly": "Tiburón de nube vuela", + "subtitles.antarchy.stratoshark_bite": "Tiburón de nube muerde", + "subtitles.antarchy.stratoshark_idle": "Tiburón de nube hace ruido", + "subtitles.antarchy.stratoshark_hurt": "Tiburón de nube recibe daño", + "subtitles.antarchy.stratoshark_death": "Tiburón de nube muere", + "subtitles.antarchy.stratoshark_fly": "Tiburón de nube vuela", "subtitles.antarchy.caterpillar_idle": "Oruga hace ruido", "subtitles.antarchy.caterpillar_hurt": "Oruga recibe daño", "subtitles.antarchy.caterpillar_crawl": "Oruga se arrastra", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "Pesadilla muere", "subtitles.antarchy.nightmare_bite": "Pesadilla muerde", "subtitles.antarchy.nightmare_flap": "Pesadilla aletea", - "subtitles.antarchy.triffid_attack": "Triffid ataca", - "subtitles.antarchy.triffid_grab": "Triffid agarra", - "subtitles.antarchy.triffid_hurt": "Triffid recibe daño", - "subtitles.antarchy.triffid_death": "Triffid muere", - "subtitles.antarchy.triffid_hiss": "Triffid sisea", - "subtitles.antarchy.triffid_growl": "Triffid gruñe", + "subtitles.antarchy.flytrap_attack": "Flytrap ataca", + "subtitles.antarchy.flytrap_grab": "Flytrap agarra", + "subtitles.antarchy.flytrap_hurt": "Flytrap recibe daño", + "subtitles.antarchy.flytrap_death": "Flytrap muere", + "subtitles.antarchy.flytrap_hiss": "Flytrap sisea", + "subtitles.antarchy.flytrap_growl": "Flytrap gruñe", "subtitles.antarchy.gravity_gun_pickup": "Pistola gravitatoria recoge", "subtitles.antarchy.gravity_gun_drop": "Pistola gravitatoria suelta", "subtitles.antarchy.gravity_gun_hold_loop": "Pistola gravitatoria zumba", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "Liquen ámbar", "block.antarchy.bile_vein": "Veta de bilis", "block.antarchy.creepvine": "Enredadera rastrera", - "block.antarchy.creeping_horror_egg": "Huevo de Horror rastrero", - "block.antarchy.lurking_terror_egg": "Huevo de Terror acechante", + "block.antarchy.crawling_blight_egg": "Huevo de Horror rastrero", + "block.antarchy.skulking_fright_egg": "Huevo de Terror acechante", "entity.antarchy.termite": "Termita", - "entity.antarchy.jumpy_bug": "Bicho saltarín", + "entity.antarchy.springbug": "Bicho saltarín", "entity.antarchy.spit_bug": "Bicho escupidor", "entity.antarchy.stink_bug": "Chinche apestosa", "entity.antarchy.rolly_polly": "Cochinilla", - "entity.antarchy.creeping_horror": "Horror rastrero", - "entity.antarchy.lurking_terror": "Terror acechante", + "entity.antarchy.crawling_blight": "Horror rastrero", + "entity.antarchy.skulking_fright": "Terror acechante", "entity.antarchy.hercules_beetle": "Escarabajo hércules", - "item.antarchy.jumpy_bug_spawn_egg": "Huevo generador de Bicho saltarín", + "item.antarchy.springbug_spawn_egg": "Huevo generador de Bicho saltarín", "item.antarchy.spit_bug_spawn_egg": "Huevo generador de Bicho escupidor", "item.antarchy.stink_bug_spawn_egg": "Huevo generador de Chinche apestosa", "item.antarchy.termite_spawn_egg": "Huevo generador de Termita", "item.antarchy.rolly_polly_spawn_egg": "Huevo generador de Cochinilla", - "item.antarchy.creeping_horror_spawn_egg": "Huevo generador de Horror rastrero", - "item.antarchy.lurking_terror_spawn_egg": "Huevo generador de Terror acechante", + "item.antarchy.crawling_blight_spawn_egg": "Huevo generador de Horror rastrero", + "item.antarchy.skulking_fright_spawn_egg": "Huevo generador de Terror acechante", "item.antarchy.hercules_beetle_spawn_egg": "Huevo generador de Escarabajo hércules", "item.antarchy.chitin": "Quitina", "block.antarchy.polished_broodstone": "Broodstone pulido", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "Bloque de hongo sombrilluz", "block.antarchy.molting_vines": "Enredaderas de muda", "item.antarchy.broodfruit": "Fruto de cría", - "block.antarchy.jumpy_bug_egg": "Huevo de Bicho saltarín", - "subtitles.antarchy.creeping_horror_growl": "Horror rastrero gruñe", - "subtitles.antarchy.creeping_horror_hurt": "Horror rastrero recibe daño", - "subtitles.antarchy.creeping_horror_bite": "Horror rastrero muerde", - "subtitles.antarchy.lurking_terror_snarl": "Terror acechante gruñe", - "subtitles.antarchy.lurking_terror_hurt": "Terror acechante recibe daño", - "subtitles.antarchy.lurking_terror_bite": "Terror acechante muerde", - "subtitles.antarchy.lurking_terror_fly_loop": "Terror acechante vuela", + "block.antarchy.springbug_egg": "Huevo de Bicho saltarín", + "subtitles.antarchy.crawling_blight_growl": "Horror rastrero gruñe", + "subtitles.antarchy.crawling_blight_hurt": "Horror rastrero recibe daño", + "subtitles.antarchy.crawling_blight_bite": "Horror rastrero muerde", + "subtitles.antarchy.skulking_fright_snarl": "Terror acechante gruñe", + "subtitles.antarchy.skulking_fright_hurt": "Terror acechante recibe daño", + "subtitles.antarchy.skulking_fright_bite": "Terror acechante muerde", + "subtitles.antarchy.skulking_fright_fly_loop": "Terror acechante vuela", "subtitles.antarchy.stink_bug_fart": "Chinche apestosa se tira un pedo", "subtitles.antarchy.stink_bug_idle": "Chinche apestosa hace ruido", "subtitles.antarchy.rolly_polly_idle": "Cochinilla hace ruido", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "Jerry sufre daño", "subtitles.antarchy.jerry_death": "Jerry muere", "subtitles.antarchy.jerry_attack": "Jerry ataca", - "subtitles.antarchy.jumpy_bug_idle": "Bicho saltarín hace ruido", + "subtitles.antarchy.springbug_idle": "Bicho saltarín hace ruido", "subtitles.antarchy.spit_bug_idle": "Bicho escupidor hace ruido", - "subtitles.antarchy.jumpy_bug_hurt": "Bicho saltarín recibe daño", - "subtitles.antarchy.jumpy_bug_jump": "Bicho saltarín salta", + "subtitles.antarchy.springbug_hurt": "Bicho saltarín recibe daño", + "subtitles.antarchy.springbug_jump": "Bicho saltarín salta", "subtitles.antarchy.spit_bug_hurt": "Bicho escupidor recibe daño", "subtitles.antarchy.spit_bug_spit": "Bicho escupidor escupe", "subtitles.antarchy.brutalfly_spit": "Brutalfly escupe", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/fr_fr.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/fr_fr.json index 7703aca8..1bb5b8ef 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/fr_fr.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/fr_fr.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "Nyxite pâle", "block.antarchy.nyxite_spike": "Pointe de Nyxite", "block.antarchy.potent_nyxite": "Nyxite puissant", - "block.antarchy.triffid_goo_block": "Bloc de Triffid Glu", + "block.antarchy.flytrap_goo_block": "Bloc de Flytrap Glu", "block.antarchy.elythia_portal": "Portail de Elythia", "block.antarchy.cloud_block": "Bloc de Nuage", "block.antarchy.thoraxis_portal": "Portail de Thoraxis", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "Fourmi arc-en-ciel", "entity.antarchy.diamond_minecart": "Le wagonnet de diamant", "entity.antarchy.dr_trayaurus": "Dr. Trayaurus", - "entity.antarchy.cloud_shark": "Requin des nuages", + "entity.antarchy.stratoshark": "Requin des nuages", "entity.antarchy.kraken": "Le Kraken", "entity.antarchy.missile_squid": "Calmar-missile", "entity.antarchy.octopus_bomb": "Bombe-pieuvre", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "Molevore", "entity.antarchy.mantis": "Mante religieuse", "entity.antarchy.alpha_mantis": "Mante alpha", - "entity.antarchy.triffid": "Triffid", + "entity.antarchy.flytrap": "Flytrap", "entity.antarchy.toreterror": "Toreterror", "entity.antarchy.water_bomb": "Bombe à eau", "subtitles.antarchy.mantis_ambient": "Mante religieuse cliquette", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "Ajusteur d’attitude", "tooltip.antarchy.attitude_adjuster.grounded": "Projette les cibles au sol vers le haut et écrase au sol celles qui sont dans les airs.", "tooltip.antarchy.attitude_adjuster.slam": "Faites un clic droit dans les airs pour vous écraser au sol.", - "item.antarchy.cloud_shark_fin": "Aileron de Requin des nuages", - "item.antarchy.cloud_shark_fin_soup": "Soupe de Aileron de Requin des nuages", - "tooltip.antarchy.cloud_shark_fin_soup": "Accorde Force et Chute lente.", + "item.antarchy.stratoshark_fin": "Aileron de Requin des nuages", + "item.antarchy.stratoshark_fin_soup": "Soupe de Aileron de Requin des nuages", + "tooltip.antarchy.stratoshark_fin_soup": "Accorde Force et Chute lente.", "tooltip.antarchy.critter_cage.empty": "Clic droit pour lancer", "tooltip.antarchy.critter_cage.contains": "Contient : %s", "tooltip.antarchy.critter_cage.release": "Clic droit pour libérer", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "Maximum de Cœurs de verre-sang", "item.antarchy.molevore_nose": "Nez de Molevore", "item.antarchy.moleworm": "Moleworm", - "item.antarchy.triffid_spawn_egg": "Œuf d’apparition de Triffid", + "item.antarchy.flytrap_spawn_egg": "Œuf d’apparition de Flytrap", "item.antarchy.infested_rooted_dirt": "Racinée Terre infesté", "item.antarchy.infested_coarse_dirt": "Stérile Terre infesté", "item.antarchy.pale_nyxite": "Nyxite pâle", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "Écaille de Roi", "item.antarchy.queen_scale": "Écaille de Reine", - "item.antarchy.jumpy_bug_leg": "Patte de Insecte sauteur", - "item.antarchy.jumpy_boots": "Bottes bondissantes", - "tooltip.antarchy.jumpy_boots": "Accroupissez-vous pour charger, puis sautez pour bondir vers le haut.", + "item.antarchy.springbug_leg": "Patte de Insecte sauteur", + "item.antarchy.springy_boots": "Bottes bondissantes", + "tooltip.antarchy.springy_boots": "Accroupissez-vous pour charger, puis sautez pour bondir vers le haut.", "item.antarchy.brutalfly_wing": "Aile de Brutalfly", "item.antarchy.brutalfly_elytra": "Élytres de Brutalfly", "tooltip.antarchy.brutalfly_elytra.flap": "En vol, maintenez %s pour battre des ailes", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "%s américain", "item.antarchy.root_beer": "Racinette", "item.antarchy.primordial_scute": "Écaille de Primordial", - "item.antarchy.triffid_goo": "Triffid Glu", - "item.antarchy.triffid_goo_block": "Bloc de Triffid Glu", - "tooltip.antarchy.triffid_goo_block": "À grande vitesse, vous rebondissez vers le haut ; sinon, vous vous enfoncez dedans.", + "item.antarchy.flytrap_goo": "Flytrap Glu", + "item.antarchy.flytrap_goo_block": "Bloc de Flytrap Glu", + "tooltip.antarchy.flytrap_goo_block": "À grande vitesse, vous rebondissez vers le haut ; sinon, vous vous enfoncez dedans.", "item.antarchy.cloud_bucket": "Seau de Nuage", "tooltip.antarchy.cloud_bucket.midair": "Peut être placé dans les airs", "item.antarchy.lumen_bucket": "Seau de Lumen", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "Œuf d’apparition de Chenille", "item.antarchy.butterfly_spawn_egg": "Œuf d’apparition de Papillon", "item.antarchy.brutalfly_spawn_egg": "Œuf d’apparition de Brutalfly", - "item.antarchy.cloud_shark_spawn_egg": "Œuf d’apparition de Requin des nuages", + "item.antarchy.stratoshark_spawn_egg": "Œuf d’apparition de Requin des nuages", "item.antarchy.kraken_spawn_egg": "Euh, non. Ne fais pas ça.", "item.antarchy.missile_squid_spawn_egg": "Œuf d’apparition de Calmar-missile", "item.antarchy.octopus_bomb_spawn_egg": "Œuf d’apparition de Bombe-pieuvre", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "La termite est prête à ouvrir sa destination.", "message.antarchy.termite_needs_reagent": "Cette termite a besoin d’un réactif avant de pouvoir ouvrir sa destination.", "death.attack.spit_bug_disrespect": "%1$s a été humilié par l’insecte cracheur", - "death.attack.jumpy_bug_jump": "%1$s s’est fait sauter dessus par l’insecte sauteur", + "death.attack.springbug_jump": "%1$s s’est fait sauter dessus par l’insecte sauteur", "death.attack.hercules_beetle_obliteration": "%1$s a été anéanti par le scarabée Hercule", "message.antarchy.big_bertha.mode": "Mode de Grosse Bertha : %s", "message.antarchy.big_bertha.mode.basilisk": "Basilic", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "Croissance", "effect.antarchy.bloodglass_ward": "Égide de verre-sang", "effect.antarchy.bloodglass_ward.description": "Accorde des cœurs qui se brisent et absorbent un coup entier de dégâts. Ils se régénèrent avec le temps.", - "death.attack.triffid_mauling": "%1$s a été déchiqueté par une plante", - "death.attack.triffid_mauling.player": "%1$s a été déchiqueté par une plante", - "death.attack.triffid_swallow": "%1$s a été avalé par un Triffid", - "death.attack.triffid_swallow.player": "%1$s a été avalé par un Triffid", + "death.attack.flytrap_mauling": "%1$s a été déchiqueté par une plante", + "death.attack.flytrap_mauling.player": "%1$s a été déchiqueté par une plante", + "death.attack.flytrap_swallow": "%1$s a été avalé par un Flytrap", + "death.attack.flytrap_swallow.player": "%1$s a été avalé par un Flytrap", "potion.antarchy.haste": "Potion de Célérité", "potion.antarchy.strong_haste": "Potion de Célérité puissante", "tooltip.antarchy.big_bertha.mode": "Mode : %s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "Fourmis mordent", "subtitles.antarchy.ant_gather": "Fourmis récoltent", "subtitles.antarchy.ant_nest": "Nid de fourmis bruisse", - "subtitles.antarchy.cloud_shark_bite": "Requin des nuages mord", - "subtitles.antarchy.cloud_shark_idle": "Requin des nuages se fait entendre", - "subtitles.antarchy.cloud_shark_hurt": "Requin des nuages est blessé", - "subtitles.antarchy.cloud_shark_death": "Requin des nuages meurt", - "subtitles.antarchy.cloud_shark_fly": "Requin des nuages vole", + "subtitles.antarchy.stratoshark_bite": "Requin des nuages mord", + "subtitles.antarchy.stratoshark_idle": "Requin des nuages se fait entendre", + "subtitles.antarchy.stratoshark_hurt": "Requin des nuages est blessé", + "subtitles.antarchy.stratoshark_death": "Requin des nuages meurt", + "subtitles.antarchy.stratoshark_fly": "Requin des nuages vole", "subtitles.antarchy.caterpillar_idle": "Chenille se fait entendre", "subtitles.antarchy.caterpillar_hurt": "Chenille est blessé", "subtitles.antarchy.caterpillar_crawl": "Chenille rampe", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "Cauchemar meurt", "subtitles.antarchy.nightmare_bite": "Cauchemar mord", "subtitles.antarchy.nightmare_flap": "Cauchemar bat des ailes", - "subtitles.antarchy.triffid_attack": "Triffid attaque", - "subtitles.antarchy.triffid_grab": "Triffid agrippe", - "subtitles.antarchy.triffid_hurt": "Triffid est blessé", - "subtitles.antarchy.triffid_death": "Triffid meurt", - "subtitles.antarchy.triffid_hiss": "Triffid siffle", - "subtitles.antarchy.triffid_growl": "Triffid gronde", + "subtitles.antarchy.flytrap_attack": "Flytrap attaque", + "subtitles.antarchy.flytrap_grab": "Flytrap agrippe", + "subtitles.antarchy.flytrap_hurt": "Flytrap est blessé", + "subtitles.antarchy.flytrap_death": "Flytrap meurt", + "subtitles.antarchy.flytrap_hiss": "Flytrap siffle", + "subtitles.antarchy.flytrap_growl": "Flytrap gronde", "subtitles.antarchy.gravity_gun_pickup": "Canon à gravité ramasse", "subtitles.antarchy.gravity_gun_drop": "Canon à gravité relâche", "subtitles.antarchy.gravity_gun_hold_loop": "Canon à gravité bourdonne", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "Lichen ambré", "block.antarchy.bile_vein": "Veine de bile", "block.antarchy.creepvine": "Liane rampante", - "block.antarchy.creeping_horror_egg": "Œuf de Horreur rampante", - "block.antarchy.lurking_terror_egg": "Œuf de Terreur tapie", + "block.antarchy.crawling_blight_egg": "Œuf de Horreur rampante", + "block.antarchy.skulking_fright_egg": "Œuf de Terreur tapie", "entity.antarchy.termite": "Termite", - "entity.antarchy.jumpy_bug": "Insecte sauteur", + "entity.antarchy.springbug": "Insecte sauteur", "entity.antarchy.spit_bug": "Insecte cracheur", "entity.antarchy.stink_bug": "Punaise puante", "entity.antarchy.rolly_polly": "Cloporte", - "entity.antarchy.creeping_horror": "Horreur rampante", - "entity.antarchy.lurking_terror": "Terreur tapie", + "entity.antarchy.crawling_blight": "Horreur rampante", + "entity.antarchy.skulking_fright": "Terreur tapie", "entity.antarchy.hercules_beetle": "Scarabée Hercule", - "item.antarchy.jumpy_bug_spawn_egg": "Œuf d’apparition de Insecte sauteur", + "item.antarchy.springbug_spawn_egg": "Œuf d’apparition de Insecte sauteur", "item.antarchy.spit_bug_spawn_egg": "Œuf d’apparition de Insecte cracheur", "item.antarchy.stink_bug_spawn_egg": "Œuf d’apparition de Punaise puante", "item.antarchy.termite_spawn_egg": "Œuf d’apparition de Termite", "item.antarchy.rolly_polly_spawn_egg": "Œuf d’apparition de Cloporte", - "item.antarchy.creeping_horror_spawn_egg": "Œuf d’apparition de Horreur rampante", - "item.antarchy.lurking_terror_spawn_egg": "Œuf d’apparition de Terreur tapie", + "item.antarchy.crawling_blight_spawn_egg": "Œuf d’apparition de Horreur rampante", + "item.antarchy.skulking_fright_spawn_egg": "Œuf d’apparition de Terreur tapie", "item.antarchy.hercules_beetle_spawn_egg": "Œuf d’apparition de Scarabée Hercule", "item.antarchy.chitin": "Chitine", "block.antarchy.polished_broodstone": "Broodstone poli", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "Bloc de champignon lumichapeau", "block.antarchy.molting_vines": "Lianes de mue", "item.antarchy.broodfruit": "Fruit de couvée", - "block.antarchy.jumpy_bug_egg": "Œuf de Insecte sauteur", - "subtitles.antarchy.creeping_horror_growl": "Horreur rampante gronde", - "subtitles.antarchy.creeping_horror_hurt": "Horreur rampante est blessé", - "subtitles.antarchy.creeping_horror_bite": "Horreur rampante mord", - "subtitles.antarchy.lurking_terror_snarl": "Terreur tapie grogne", - "subtitles.antarchy.lurking_terror_hurt": "Terreur tapie est blessé", - "subtitles.antarchy.lurking_terror_bite": "Terreur tapie mord", - "subtitles.antarchy.lurking_terror_fly_loop": "Terreur tapie vole", + "block.antarchy.springbug_egg": "Œuf de Insecte sauteur", + "subtitles.antarchy.crawling_blight_growl": "Horreur rampante gronde", + "subtitles.antarchy.crawling_blight_hurt": "Horreur rampante est blessé", + "subtitles.antarchy.crawling_blight_bite": "Horreur rampante mord", + "subtitles.antarchy.skulking_fright_snarl": "Terreur tapie grogne", + "subtitles.antarchy.skulking_fright_hurt": "Terreur tapie est blessé", + "subtitles.antarchy.skulking_fright_bite": "Terreur tapie mord", + "subtitles.antarchy.skulking_fright_fly_loop": "Terreur tapie vole", "subtitles.antarchy.stink_bug_fart": "Punaise puante pète", "subtitles.antarchy.stink_bug_idle": "Punaise puante se fait entendre", "subtitles.antarchy.rolly_polly_idle": "Cloporte se fait entendre", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "Jerry souffre", "subtitles.antarchy.jerry_death": "Jerry meurt", "subtitles.antarchy.jerry_attack": "Jerry attaque", - "subtitles.antarchy.jumpy_bug_idle": "Insecte sauteur se fait entendre", + "subtitles.antarchy.springbug_idle": "Insecte sauteur se fait entendre", "subtitles.antarchy.spit_bug_idle": "Insecte cracheur se fait entendre", - "subtitles.antarchy.jumpy_bug_hurt": "Insecte sauteur est blessé", - "subtitles.antarchy.jumpy_bug_jump": "Insecte sauteur saute", + "subtitles.antarchy.springbug_hurt": "Insecte sauteur est blessé", + "subtitles.antarchy.springbug_jump": "Insecte sauteur saute", "subtitles.antarchy.spit_bug_hurt": "Insecte cracheur est blessé", "subtitles.antarchy.spit_bug_spit": "Insecte cracheur crache", "subtitles.antarchy.brutalfly_spit": "Brutalfly crache", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/it_it.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/it_it.json index 9579936b..e5ceab2e 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/it_it.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/it_it.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "Nyxite pallido", "block.antarchy.nyxite_spike": "Spuntone di Nyxite", "block.antarchy.potent_nyxite": "Nyxite potente", - "block.antarchy.triffid_goo_block": "Blocco di Melma di Triffid", + "block.antarchy.flytrap_goo_block": "Blocco di Melma di Flytrap", "block.antarchy.elythia_portal": "Portale di Elythia", "block.antarchy.cloud_block": "Blocco di Nuvola", "block.antarchy.thoraxis_portal": "Portale di Thoraxis", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "Formica arcobaleno", "entity.antarchy.diamond_minecart": "Il carrello di diamante", "entity.antarchy.dr_trayaurus": "Dott. Trayaurus", - "entity.antarchy.cloud_shark": "Squalo delle nuvole", + "entity.antarchy.stratoshark": "Squalo delle nuvole", "entity.antarchy.kraken": "Il Kraken", "entity.antarchy.missile_squid": "Calamaro missile", "entity.antarchy.octopus_bomb": "Bomba polpo", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "Molevore", "entity.antarchy.mantis": "Mantide", "entity.antarchy.alpha_mantis": "Mantide alfa", - "entity.antarchy.triffid": "Triffid", + "entity.antarchy.flytrap": "Flytrap", "entity.antarchy.toreterror": "Toreterror", "entity.antarchy.water_bomb": "Bomba d’acqua", "subtitles.antarchy.mantis_ambient": "La mantide scatta", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "Correttore d’atteggiamento", "tooltip.antarchy.attitude_adjuster.grounded": "Scaglia in aria i bersagli a terra e schianta al suolo quelli in volo.", "tooltip.antarchy.attitude_adjuster.slam": "Fai clic destro in aria per schiantarti al suolo.", - "item.antarchy.cloud_shark_fin": "Pinna di squalo delle nuvole", - "item.antarchy.cloud_shark_fin_soup": "Zuppa di pinna di squalo delle nuvole", - "tooltip.antarchy.cloud_shark_fin_soup": "Conferisce Forza e Caduta lenta.", + "item.antarchy.stratoshark_fin": "Pinna di squalo delle nuvole", + "item.antarchy.stratoshark_fin_soup": "Zuppa di pinna di squalo delle nuvole", + "tooltip.antarchy.stratoshark_fin_soup": "Conferisce Forza e Caduta lenta.", "tooltip.antarchy.critter_cage.empty": "Fai clic destro per lanciare", "tooltip.antarchy.critter_cage.contains": "Contiene: %s", "tooltip.antarchy.critter_cage.release": "Fai clic destro per liberare", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "Cuori di vetrosangue massimi", "item.antarchy.molevore_nose": "Naso di Molevore", "item.antarchy.moleworm": "Moleworm", - "item.antarchy.triffid_spawn_egg": "Uovo generatore di Triffid", + "item.antarchy.flytrap_spawn_egg": "Uovo generatore di Flytrap", "item.antarchy.infested_rooted_dirt": "Terra con radici infestato", "item.antarchy.infested_coarse_dirt": "Terra brulla infestato", "item.antarchy.pale_nyxite": "Nyxite pallido", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "Scaglia di Re", "item.antarchy.queen_scale": "Scaglia di Regina", - "item.antarchy.jumpy_bug_leg": "Zampa di Insetto saltatore", - "item.antarchy.jumpy_boots": "Stivali saltatori", - "tooltip.antarchy.jumpy_boots": "Accovacciati per caricare, poi salta per balzare verso l’alto.", + "item.antarchy.springbug_leg": "Zampa di Insetto saltatore", + "item.antarchy.springy_boots": "Stivali saltatori", + "tooltip.antarchy.springy_boots": "Accovacciati per caricare, poi salta per balzare verso l’alto.", "item.antarchy.brutalfly_wing": "Ala di Brutalfly", "item.antarchy.brutalfly_elytra": "Elitre di Brutalfly", "tooltip.antarchy.brutalfly_elytra.flap": "Durante il volo, tieni premuto %s per battere le ali", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "%s americano", "item.antarchy.root_beer": "Birra di radice", "item.antarchy.primordial_scute": "Scuto di Primordiale", - "item.antarchy.triffid_goo": "Melma di Triffid", - "item.antarchy.triffid_goo_block": "Blocco di Melma di Triffid", - "tooltip.antarchy.triffid_goo_block": "Ad alta velocità rimbalzi verso l’alto; altrimenti ci sprofondi attraverso.", + "item.antarchy.flytrap_goo": "Melma di Flytrap", + "item.antarchy.flytrap_goo_block": "Blocco di Melma di Flytrap", + "tooltip.antarchy.flytrap_goo_block": "Ad alta velocità rimbalzi verso l’alto; altrimenti ci sprofondi attraverso.", "item.antarchy.cloud_bucket": "Secchio di Nuvola", "tooltip.antarchy.cloud_bucket.midair": "Può essere posizionato a mezz’aria", "item.antarchy.lumen_bucket": "Secchio di Lumen", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "Uovo generatore di Bruco", "item.antarchy.butterfly_spawn_egg": "Uovo generatore di Farfalla", "item.antarchy.brutalfly_spawn_egg": "Uovo generatore di Brutalfly", - "item.antarchy.cloud_shark_spawn_egg": "Uovo generatore di Squalo delle nuvole", + "item.antarchy.stratoshark_spawn_egg": "Uovo generatore di Squalo delle nuvole", "item.antarchy.kraken_spawn_egg": "Ehm, no. Non farlo.", "item.antarchy.missile_squid_spawn_egg": "Uovo generatore di Calamaro missile", "item.antarchy.octopus_bomb_spawn_egg": "Uovo generatore di Bomba polpo", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "La termite è pronta ad aprire la sua destinazione.", "message.antarchy.termite_needs_reagent": "Questa termite ha bisogno di un reagente prima di poter aprire la destinazione.", "death.attack.spit_bug_disrespect": "%1$s è stato umiliato dall’Insetto sputatore", - "death.attack.jumpy_bug_jump": "%1$s è stato assalito dall’Insetto saltatore", + "death.attack.springbug_jump": "%1$s è stato assalito dall’Insetto saltatore", "death.attack.hercules_beetle_obliteration": "%1$s è stato annientato dallo Scarabeo Ercole", "message.antarchy.big_bertha.mode": "Modalità Big Bertha: %s", "message.antarchy.big_bertha.mode.basilisk": "Basilisco", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "Crescita", "effect.antarchy.bloodglass_ward": "Protezione di vetrosangue", "effect.antarchy.bloodglass_ward.description": "Conferisce cuori che si frantumano assorbendo un colpo intero di danno. Si rigenerano col tempo.", - "death.attack.triffid_mauling": "%1$s è stato sbranato a morte da una pianta", - "death.attack.triffid_mauling.player": "%1$s è stato sbranato a morte da una pianta", - "death.attack.triffid_swallow": "%1$s è stato inghiottito da un Triffid", - "death.attack.triffid_swallow.player": "%1$s è stato inghiottito da un Triffid", + "death.attack.flytrap_mauling": "%1$s è stato sbranato a morte da una pianta", + "death.attack.flytrap_mauling.player": "%1$s è stato sbranato a morte da una pianta", + "death.attack.flytrap_swallow": "%1$s è stato inghiottito da un Flytrap", + "death.attack.flytrap_swallow.player": "%1$s è stato inghiottito da un Flytrap", "potion.antarchy.haste": "Pozione di Rapidità", "potion.antarchy.strong_haste": "Pozione forte di Rapidità", "tooltip.antarchy.big_bertha.mode": "Modalità: %s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "Le formiche mordono", "subtitles.antarchy.ant_gather": "Le formiche raccolgono", "subtitles.antarchy.ant_nest": "Il formicaio fruscia", - "subtitles.antarchy.cloud_shark_bite": "Lo squalo delle nuvole morde", - "subtitles.antarchy.cloud_shark_idle": "Lo squalo delle nuvole emette un verso", - "subtitles.antarchy.cloud_shark_hurt": "Lo squalo delle nuvole si ferisce", - "subtitles.antarchy.cloud_shark_death": "Lo squalo delle nuvole muore", - "subtitles.antarchy.cloud_shark_fly": "Lo squalo delle nuvole vola", + "subtitles.antarchy.stratoshark_bite": "Lo squalo delle nuvole morde", + "subtitles.antarchy.stratoshark_idle": "Lo squalo delle nuvole emette un verso", + "subtitles.antarchy.stratoshark_hurt": "Lo squalo delle nuvole si ferisce", + "subtitles.antarchy.stratoshark_death": "Lo squalo delle nuvole muore", + "subtitles.antarchy.stratoshark_fly": "Lo squalo delle nuvole vola", "subtitles.antarchy.caterpillar_idle": "Il bruco emette un verso", "subtitles.antarchy.caterpillar_hurt": "Il bruco si ferisce", "subtitles.antarchy.caterpillar_crawl": "Il bruco striscia", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "L’Incubo muore", "subtitles.antarchy.nightmare_bite": "L’Incubo morde", "subtitles.antarchy.nightmare_flap": "L’Incubo batte le ali", - "subtitles.antarchy.triffid_attack": "Il Triffid attacca", - "subtitles.antarchy.triffid_grab": "Il Triffid afferra", - "subtitles.antarchy.triffid_hurt": "Il Triffid si ferisce", - "subtitles.antarchy.triffid_death": "Il Triffid muore", - "subtitles.antarchy.triffid_hiss": "Il Triffid sibila", - "subtitles.antarchy.triffid_growl": "Il Triffid ringhia", + "subtitles.antarchy.flytrap_attack": "Il Flytrap attacca", + "subtitles.antarchy.flytrap_grab": "Il Flytrap afferra", + "subtitles.antarchy.flytrap_hurt": "Il Flytrap si ferisce", + "subtitles.antarchy.flytrap_death": "Il Flytrap muore", + "subtitles.antarchy.flytrap_hiss": "Il Flytrap sibila", + "subtitles.antarchy.flytrap_growl": "Il Flytrap ringhia", "subtitles.antarchy.gravity_gun_pickup": "Il cannone gravitazionale solleva", "subtitles.antarchy.gravity_gun_drop": "Il cannone gravitazionale lascia cadere", "subtitles.antarchy.gravity_gun_hold_loop": "Il cannone gravitazionale ronza", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "Lichene ambrato", "block.antarchy.bile_vein": "Vena di bile", "block.antarchy.creepvine": "Creepvine", - "block.antarchy.creeping_horror_egg": "Uovo di Orrore strisciante", - "block.antarchy.lurking_terror_egg": "Uovo di Terrore in agguato", + "block.antarchy.crawling_blight_egg": "Uovo di Orrore strisciante", + "block.antarchy.skulking_fright_egg": "Uovo di Terrore in agguato", "entity.antarchy.termite": "Termite", - "entity.antarchy.jumpy_bug": "Insetto saltatore", + "entity.antarchy.springbug": "Insetto saltatore", "entity.antarchy.spit_bug": "Insetto sputatore", "entity.antarchy.stink_bug": "Cimice puzzolente", "entity.antarchy.rolly_polly": "Porcellino di terra", - "entity.antarchy.creeping_horror": "Orrore strisciante", - "entity.antarchy.lurking_terror": "Terrore in agguato", + "entity.antarchy.crawling_blight": "Orrore strisciante", + "entity.antarchy.skulking_fright": "Terrore in agguato", "entity.antarchy.hercules_beetle": "Scarabeo Ercole", - "item.antarchy.jumpy_bug_spawn_egg": "Uovo generatore di Insetto saltatore", + "item.antarchy.springbug_spawn_egg": "Uovo generatore di Insetto saltatore", "item.antarchy.spit_bug_spawn_egg": "Uovo generatore di Insetto sputatore", "item.antarchy.stink_bug_spawn_egg": "Uovo generatore di Cimice puzzolente", "item.antarchy.termite_spawn_egg": "Uovo generatore di Termite", "item.antarchy.rolly_polly_spawn_egg": "Uovo generatore di Porcellino di terra", - "item.antarchy.creeping_horror_spawn_egg": "Uovo generatore di Orrore strisciante", - "item.antarchy.lurking_terror_spawn_egg": "Uovo generatore di Terrore in agguato", + "item.antarchy.crawling_blight_spawn_egg": "Uovo generatore di Orrore strisciante", + "item.antarchy.skulking_fright_spawn_egg": "Uovo generatore di Terrore in agguato", "item.antarchy.hercules_beetle_spawn_egg": "Uovo generatore di Scarabeo Ercole", "item.antarchy.chitin": "Chiten", "block.antarchy.polished_broodstone": "Broodstone levigato", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "Blocco di fungo Glowcap", "block.antarchy.molting_vines": "Rampicanti della muta", "item.antarchy.broodfruit": "Broodfruit", - "block.antarchy.jumpy_bug_egg": "Uovo di Insetto saltatore", - "subtitles.antarchy.creeping_horror_growl": "L’orrore strisciante ringhia", - "subtitles.antarchy.creeping_horror_hurt": "L’orrore strisciante si ferisce", - "subtitles.antarchy.creeping_horror_bite": "L’orrore strisciante morde", - "subtitles.antarchy.lurking_terror_snarl": "Il terrore in agguato ringhia", - "subtitles.antarchy.lurking_terror_hurt": "Il terrore in agguato si ferisce", - "subtitles.antarchy.lurking_terror_bite": "Il terrore in agguato morde", - "subtitles.antarchy.lurking_terror_fly_loop": "Il terrore in agguato vola", + "block.antarchy.springbug_egg": "Uovo di Insetto saltatore", + "subtitles.antarchy.crawling_blight_growl": "L’orrore strisciante ringhia", + "subtitles.antarchy.crawling_blight_hurt": "L’orrore strisciante si ferisce", + "subtitles.antarchy.crawling_blight_bite": "L’orrore strisciante morde", + "subtitles.antarchy.skulking_fright_snarl": "Il terrore in agguato ringhia", + "subtitles.antarchy.skulking_fright_hurt": "Il terrore in agguato si ferisce", + "subtitles.antarchy.skulking_fright_bite": "Il terrore in agguato morde", + "subtitles.antarchy.skulking_fright_fly_loop": "Il terrore in agguato vola", "subtitles.antarchy.stink_bug_fart": "La cimice puzzolente scoreggia", "subtitles.antarchy.stink_bug_idle": "La cimice puzzolente emette un verso", "subtitles.antarchy.rolly_polly_idle": "Il porcellino di terra emette un verso", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "Jerry soffre", "subtitles.antarchy.jerry_death": "Jerry muore", "subtitles.antarchy.jerry_attack": "Jerry attacca", - "subtitles.antarchy.jumpy_bug_idle": "L’insetto saltatore emette un verso", + "subtitles.antarchy.springbug_idle": "L’insetto saltatore emette un verso", "subtitles.antarchy.spit_bug_idle": "L’insetto sputatore emette un verso", - "subtitles.antarchy.jumpy_bug_hurt": "L’insetto saltatore si ferisce", - "subtitles.antarchy.jumpy_bug_jump": "L’insetto saltatore salta", + "subtitles.antarchy.springbug_hurt": "L’insetto saltatore si ferisce", + "subtitles.antarchy.springbug_jump": "L’insetto saltatore salta", "subtitles.antarchy.spit_bug_hurt": "L’insetto sputatore si ferisce", "subtitles.antarchy.spit_bug_spit": "L’insetto sputatore sputa", "subtitles.antarchy.brutalfly_spit": "La Brutalfly sputa", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/ja_jp.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/ja_jp.json index fd365eb1..664b7767 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/ja_jp.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/ja_jp.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "淡いニクサイト", "block.antarchy.nyxite_spike": "ニクサイトのトゲ", "block.antarchy.potent_nyxite": "強力なニクサイト", - "block.antarchy.triffid_goo_block": "トリフィド 粘液のブロック", + "block.antarchy.flytrap_goo_block": "トリフィド 粘液のブロック", "block.antarchy.elythia_portal": "エリーティアのポータル", "block.antarchy.cloud_block": "雲のブロック", "block.antarchy.thoraxis_portal": "ソーアクシスのポータル", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "虹色のアリ", "entity.antarchy.diamond_minecart": "ダイヤモンドのトロッコ", "entity.antarchy.dr_trayaurus": "トレイオーラス博士", - "entity.antarchy.cloud_shark": "雲ザメ", + "entity.antarchy.stratoshark": "雲ザメ", "entity.antarchy.kraken": "クラーケン", "entity.antarchy.missile_squid": "ミサイルイカ", "entity.antarchy.octopus_bomb": "タコ爆弾", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "モールヴォア", "entity.antarchy.mantis": "カマキリ", "entity.antarchy.alpha_mantis": "アルファカマキリ", - "entity.antarchy.triffid": "トリフィド", + "entity.antarchy.flytrap": "トリフィド", "entity.antarchy.toreterror": "トアテラー", "entity.antarchy.water_bomb": "水爆弾", "subtitles.antarchy.mantis_ambient": "カマキリがカチカチ鳴く", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "態度調整ハンマー", "tooltip.antarchy.attitude_adjuster.grounded": "地上の対象を上空へ吹き飛ばし、空中の対象を地面へ叩きつけます。", "tooltip.antarchy.attitude_adjuster.slam": "空中で右クリックすると地面へ急降下します。", - "item.antarchy.cloud_shark_fin": "雲ザメのヒレ", - "item.antarchy.cloud_shark_fin_soup": "雲ザメのヒレのスープ", - "tooltip.antarchy.cloud_shark_fin_soup": "攻撃力上昇と低速落下を付与します。", + "item.antarchy.stratoshark_fin": "雲ザメのヒレ", + "item.antarchy.stratoshark_fin_soup": "雲ザメのヒレのスープ", + "tooltip.antarchy.stratoshark_fin_soup": "攻撃力上昇と低速落下を付与します。", "tooltip.antarchy.critter_cage.empty": "右クリックで投げる", "tooltip.antarchy.critter_cage.contains": "中身：%s", "tooltip.antarchy.critter_cage.release": "右クリックで解放", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "血晶のハート上限", "item.antarchy.molevore_nose": "モールヴォアの鼻", "item.antarchy.moleworm": "モールワーム", - "item.antarchy.triffid_spawn_egg": "トリフィドのスポーンエッグ", + "item.antarchy.flytrap_spawn_egg": "トリフィドのスポーンエッグ", "item.antarchy.infested_rooted_dirt": "虫食いの根付いた 土", "item.antarchy.infested_coarse_dirt": "虫食いの粗い 土", "item.antarchy.pale_nyxite": "淡いニクサイト", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "王の鱗", "item.antarchy.queen_scale": "女王の鱗", - "item.antarchy.jumpy_bug_leg": "ジャンピーバグの脚", - "item.antarchy.jumpy_boots": "ジャンプブーツ", - "tooltip.antarchy.jumpy_boots": "スニークで溜めてからジャンプすると高く跳び上がります。", + "item.antarchy.springbug_leg": "ジャンピーバグの脚", + "item.antarchy.springy_boots": "ジャンプブーツ", + "tooltip.antarchy.springy_boots": "スニークで溜めてからジャンプすると高く跳び上がります。", "item.antarchy.brutalfly_wing": "ブルータルフライの翼", "item.antarchy.brutalfly_elytra": "ブルータルフライのエリトラ", "tooltip.antarchy.brutalfly_elytra.flap": "飛行中に%sを長押しして羽ばたきます", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "アメリカン%s", "item.antarchy.root_beer": "ルートビア", "item.antarchy.primordial_scute": "原初のの甲板", - "item.antarchy.triffid_goo": "トリフィド 粘液", - "item.antarchy.triffid_goo_block": "トリフィド 粘液のブロック", - "tooltip.antarchy.triffid_goo_block": "高速で触れると上へ跳ね返り、それ以外では沈み込みます。", + "item.antarchy.flytrap_goo": "トリフィド 粘液", + "item.antarchy.flytrap_goo_block": "トリフィド 粘液のブロック", + "tooltip.antarchy.flytrap_goo_block": "高速で触れると上へ跳ね返り、それ以外では沈み込みます。", "item.antarchy.cloud_bucket": "雲のバケツ", "tooltip.antarchy.cloud_bucket.midair": "空中に設置できます", "item.antarchy.lumen_bucket": "ルーメンのバケツ", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "イモムシのスポーンエッグ", "item.antarchy.butterfly_spawn_egg": "チョウのスポーンエッグ", "item.antarchy.brutalfly_spawn_egg": "ブルータルフライのスポーンエッグ", - "item.antarchy.cloud_shark_spawn_egg": "雲ザメのスポーンエッグ", + "item.antarchy.stratoshark_spawn_egg": "雲ザメのスポーンエッグ", "item.antarchy.kraken_spawn_egg": "いや、やめて。", "item.antarchy.missile_squid_spawn_egg": "ミサイルイカのスポーンエッグ", "item.antarchy.octopus_bomb_spawn_egg": "タコ爆弾のスポーンエッグ", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "シロアリは行き先を開く準備ができています。", "message.antarchy.termite_needs_reagent": "このシロアリが行き先を開くには試薬が必要です。", "death.attack.spit_bug_disrespect": "%1$sはスピットバグに無礼を働かれた", - "death.attack.jumpy_bug_jump": "%1$sはジャンピーバグに飛びかかられた", + "death.attack.springbug_jump": "%1$sはジャンピーバグに飛びかかられた", "death.attack.hercules_beetle_obliteration": "%1$sはヘラクレスオオカブトに消し飛ばされた", "message.antarchy.big_bertha.mode": "ビッグ・バーサのモード：%s", "message.antarchy.big_bertha.mode.basilisk": "バジリスク", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "成長", "effect.antarchy.bloodglass_ward": "血晶の守護", "effect.antarchy.bloodglass_ward.description": "砕けるハートを与え、1回分のダメージを丸ごと吸収します。時間経過で再生します。", - "death.attack.triffid_mauling": "%1$sは植物に噛み殺された", - "death.attack.triffid_mauling.player": "%1$sは植物に噛み殺された", - "death.attack.triffid_swallow": "%1$sはトリフィドに飲み込まれた", - "death.attack.triffid_swallow.player": "%1$sはトリフィドに飲み込まれた", + "death.attack.flytrap_mauling": "%1$sは植物に噛み殺された", + "death.attack.flytrap_mauling.player": "%1$sは植物に噛み殺された", + "death.attack.flytrap_swallow": "%1$sはトリフィドに飲み込まれた", + "death.attack.flytrap_swallow.player": "%1$sはトリフィドに飲み込まれた", "potion.antarchy.haste": "採掘速度上昇のポーション", "potion.antarchy.strong_haste": "採掘速度上昇 Ⅱのポーション", "tooltip.antarchy.big_bertha.mode": "モード：%s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "アリが噛む", "subtitles.antarchy.ant_gather": "アリが集める", "subtitles.antarchy.ant_nest": "アリの巣がざわめく", - "subtitles.antarchy.cloud_shark_bite": "雲ザメが噛む", - "subtitles.antarchy.cloud_shark_idle": "雲ザメが鳴く", - "subtitles.antarchy.cloud_shark_hurt": "雲ザメが傷つく", - "subtitles.antarchy.cloud_shark_death": "雲ザメが倒れる", - "subtitles.antarchy.cloud_shark_fly": "雲ザメが飛ぶ", + "subtitles.antarchy.stratoshark_bite": "雲ザメが噛む", + "subtitles.antarchy.stratoshark_idle": "雲ザメが鳴く", + "subtitles.antarchy.stratoshark_hurt": "雲ザメが傷つく", + "subtitles.antarchy.stratoshark_death": "雲ザメが倒れる", + "subtitles.antarchy.stratoshark_fly": "雲ザメが飛ぶ", "subtitles.antarchy.caterpillar_idle": "イモムシが鳴く", "subtitles.antarchy.caterpillar_hurt": "イモムシが傷つく", "subtitles.antarchy.caterpillar_crawl": "イモムシが這う", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "ナイトメアが倒れる", "subtitles.antarchy.nightmare_bite": "ナイトメアが噛む", "subtitles.antarchy.nightmare_flap": "ナイトメアが羽ばたく", - "subtitles.antarchy.triffid_attack": "トリフィドが攻撃する", - "subtitles.antarchy.triffid_grab": "トリフィドが掴む", - "subtitles.antarchy.triffid_hurt": "トリフィドが傷つく", - "subtitles.antarchy.triffid_death": "トリフィドが倒れる", - "subtitles.antarchy.triffid_hiss": "トリフィドがシューッと鳴る", - "subtitles.antarchy.triffid_growl": "トリフィドが唸る", + "subtitles.antarchy.flytrap_attack": "トリフィドが攻撃する", + "subtitles.antarchy.flytrap_grab": "トリフィドが掴む", + "subtitles.antarchy.flytrap_hurt": "トリフィドが傷つく", + "subtitles.antarchy.flytrap_death": "トリフィドが倒れる", + "subtitles.antarchy.flytrap_hiss": "トリフィドがシューッと鳴る", + "subtitles.antarchy.flytrap_growl": "トリフィドが唸る", "subtitles.antarchy.gravity_gun_pickup": "重力銃が持ち上げる", "subtitles.antarchy.gravity_gun_drop": "重力銃が放す", "subtitles.antarchy.gravity_gun_hold_loop": "重力銃が低く唸る", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "琥珀色の地衣類", "block.antarchy.bile_vein": "胆汁脈", "block.antarchy.creepvine": "クリープヴァイン", - "block.antarchy.creeping_horror_egg": "這い寄る恐怖の卵", - "block.antarchy.lurking_terror_egg": "潜む恐怖の卵", + "block.antarchy.crawling_blight_egg": "這い寄る恐怖の卵", + "block.antarchy.skulking_fright_egg": "潜む恐怖の卵", "entity.antarchy.termite": "シロアリ", - "entity.antarchy.jumpy_bug": "ジャンピーバグ", + "entity.antarchy.springbug": "ジャンピーバグ", "entity.antarchy.spit_bug": "スピットバグ", "entity.antarchy.stink_bug": "カメムシ", "entity.antarchy.rolly_polly": "ダンゴムシ", - "entity.antarchy.creeping_horror": "這い寄る恐怖", - "entity.antarchy.lurking_terror": "潜む恐怖", + "entity.antarchy.crawling_blight": "這い寄る恐怖", + "entity.antarchy.skulking_fright": "潜む恐怖", "entity.antarchy.hercules_beetle": "ヘラクレスオオカブト", - "item.antarchy.jumpy_bug_spawn_egg": "ジャンピーバグのスポーンエッグ", + "item.antarchy.springbug_spawn_egg": "ジャンピーバグのスポーンエッグ", "item.antarchy.spit_bug_spawn_egg": "スピットバグのスポーンエッグ", "item.antarchy.stink_bug_spawn_egg": "カメムシのスポーンエッグ", "item.antarchy.termite_spawn_egg": "シロアリのスポーンエッグ", "item.antarchy.rolly_polly_spawn_egg": "ダンゴムシのスポーンエッグ", - "item.antarchy.creeping_horror_spawn_egg": "這い寄る恐怖のスポーンエッグ", - "item.antarchy.lurking_terror_spawn_egg": "潜む恐怖のスポーンエッグ", + "item.antarchy.crawling_blight_spawn_egg": "這い寄る恐怖のスポーンエッグ", + "item.antarchy.skulking_fright_spawn_egg": "潜む恐怖のスポーンエッグ", "item.antarchy.hercules_beetle_spawn_egg": "ヘラクレスオオカブトのスポーンエッグ", "item.antarchy.chitin": "キチン", "block.antarchy.polished_broodstone": "磨かれたブルードストーン", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "グロウキャップキノコブロック", "block.antarchy.molting_vines": "脱皮のツタ", "item.antarchy.broodfruit": "ブルードフルーツ", - "block.antarchy.jumpy_bug_egg": "ジャンピーバグの卵", - "subtitles.antarchy.creeping_horror_growl": "這い寄る恐怖が唸る", - "subtitles.antarchy.creeping_horror_hurt": "這い寄る恐怖が傷つく", - "subtitles.antarchy.creeping_horror_bite": "這い寄る恐怖が噛む", - "subtitles.antarchy.lurking_terror_snarl": "潜む恐怖が唸る", - "subtitles.antarchy.lurking_terror_hurt": "潜む恐怖が傷つく", - "subtitles.antarchy.lurking_terror_bite": "潜む恐怖が噛む", - "subtitles.antarchy.lurking_terror_fly_loop": "潜む恐怖が飛ぶ", + "block.antarchy.springbug_egg": "ジャンピーバグの卵", + "subtitles.antarchy.crawling_blight_growl": "這い寄る恐怖が唸る", + "subtitles.antarchy.crawling_blight_hurt": "這い寄る恐怖が傷つく", + "subtitles.antarchy.crawling_blight_bite": "這い寄る恐怖が噛む", + "subtitles.antarchy.skulking_fright_snarl": "潜む恐怖が唸る", + "subtitles.antarchy.skulking_fright_hurt": "潜む恐怖が傷つく", + "subtitles.antarchy.skulking_fright_bite": "潜む恐怖が噛む", + "subtitles.antarchy.skulking_fright_fly_loop": "潜む恐怖が飛ぶ", "subtitles.antarchy.stink_bug_fart": "カメムシが屁をする", "subtitles.antarchy.stink_bug_idle": "カメムシが鳴く", "subtitles.antarchy.rolly_polly_idle": "ダンゴムシが鳴く", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "ジェリーが傷つく", "subtitles.antarchy.jerry_death": "ジェリーが死ぬ", "subtitles.antarchy.jerry_attack": "ジェリーが攻撃する", - "subtitles.antarchy.jumpy_bug_idle": "ジャンピーバグが鳴く", + "subtitles.antarchy.springbug_idle": "ジャンピーバグが鳴く", "subtitles.antarchy.spit_bug_idle": "スピットバグが鳴く", - "subtitles.antarchy.jumpy_bug_hurt": "ジャンピーバグが傷つく", - "subtitles.antarchy.jumpy_bug_jump": "ジャンピーバグが跳ぶ", + "subtitles.antarchy.springbug_hurt": "ジャンピーバグが傷つく", + "subtitles.antarchy.springbug_jump": "ジャンピーバグが跳ぶ", "subtitles.antarchy.spit_bug_hurt": "スピットバグが傷つく", "subtitles.antarchy.spit_bug_spit": "スピットバグが吐き出す", "subtitles.antarchy.brutalfly_spit": "ブルータルフライが吐き出す", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/ko_kr.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/ko_kr.json index daddf8f6..4d74cf03 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/ko_kr.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/ko_kr.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "창백한 닉사이트", "block.antarchy.nyxite_spike": "닉사이트 가시", "block.antarchy.potent_nyxite": "강력한 닉사이트", - "block.antarchy.triffid_goo_block": "트리피드 점액 블록", + "block.antarchy.flytrap_goo_block": "트리피드 점액 블록", "block.antarchy.elythia_portal": "엘리티아 차원문", "block.antarchy.cloud_block": "구름 블록", "block.antarchy.thoraxis_portal": "토랙시스 차원문", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "무지개 개미", "entity.antarchy.diamond_minecart": "다이아몬드 광산 수레", "entity.antarchy.dr_trayaurus": "트레이오러스 박사", - "entity.antarchy.cloud_shark": "구름 상어", + "entity.antarchy.stratoshark": "구름 상어", "entity.antarchy.kraken": "크라켄", "entity.antarchy.missile_squid": "미사일 오징어", "entity.antarchy.octopus_bomb": "문어 폭탄", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "몰보어", "entity.antarchy.mantis": "사마귀", "entity.antarchy.alpha_mantis": "알파 사마귀", - "entity.antarchy.triffid": "트리피드", + "entity.antarchy.flytrap": "트리피드", "entity.antarchy.toreterror": "토어테러", "entity.antarchy.water_bomb": "물 폭탄", "subtitles.antarchy.mantis_ambient": "사마귀 딸깍거립니다", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "태도 교정기", "tooltip.antarchy.attitude_adjuster.grounded": "지상의 대상을 위로 날리고, 공중의 대상을 땅으로 내리꽂습니다.", "tooltip.antarchy.attitude_adjuster.slam": "공중에서 우클릭하면 지면 강타를 합니다.", - "item.antarchy.cloud_shark_fin": "구름 상어 지느러미", - "item.antarchy.cloud_shark_fin_soup": "구름 상어 지느러미 수프", - "tooltip.antarchy.cloud_shark_fin_soup": "힘과 느린 낙하를 부여합니다.", + "item.antarchy.stratoshark_fin": "구름 상어 지느러미", + "item.antarchy.stratoshark_fin_soup": "구름 상어 지느러미 수프", + "tooltip.antarchy.stratoshark_fin_soup": "힘과 느린 낙하를 부여합니다.", "tooltip.antarchy.critter_cage.empty": "우클릭하여 던지기", "tooltip.antarchy.critter_cage.contains": "들어 있음: %s", "tooltip.antarchy.critter_cage.release": "우클릭하여 풀어주기", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "최대 혈유리 심장", "item.antarchy.molevore_nose": "몰보어 코", "item.antarchy.moleworm": "몰웜", - "item.antarchy.triffid_spawn_egg": "트리피드 생성 알", + "item.antarchy.flytrap_spawn_egg": "트리피드 생성 알", "item.antarchy.infested_rooted_dirt": "감염된 뿌리내린 흙", "item.antarchy.infested_coarse_dirt": "감염된 거친 흙", "item.antarchy.pale_nyxite": "창백한 닉사이트", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "왕 비늘", "item.antarchy.queen_scale": "여왕 비늘", - "item.antarchy.jumpy_bug_leg": "점피 벌레 다리", - "item.antarchy.jumpy_boots": "점피 부츠", - "tooltip.antarchy.jumpy_boots": "웅크려 충전한 뒤 점프하면 위로 튀어 오릅니다.", + "item.antarchy.springbug_leg": "점피 벌레 다리", + "item.antarchy.springy_boots": "점피 부츠", + "tooltip.antarchy.springy_boots": "웅크려 충전한 뒤 점프하면 위로 튀어 오릅니다.", "item.antarchy.brutalfly_wing": "브루털플라이 날개", "item.antarchy.brutalfly_elytra": "브루털플라이 겉날개", "tooltip.antarchy.brutalfly_elytra.flap": "비행 중 %s을 길게 눌러 날갯짓합니다", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "미국식 %s", "item.antarchy.root_beer": "루트 비어", "item.antarchy.primordial_scute": "태고의 등딱지 조각", - "item.antarchy.triffid_goo": "트리피드 점액", - "item.antarchy.triffid_goo_block": "트리피드 점액 블록", - "tooltip.antarchy.triffid_goo_block": "빠르게 부딪히면 튀어 오르고, 아니면 안으로 가라앉습니다.", + "item.antarchy.flytrap_goo": "트리피드 점액", + "item.antarchy.flytrap_goo_block": "트리피드 점액 블록", + "tooltip.antarchy.flytrap_goo_block": "빠르게 부딪히면 튀어 오르고, 아니면 안으로 가라앉습니다.", "item.antarchy.cloud_bucket": "구름 양동이", "tooltip.antarchy.cloud_bucket.midair": "공중에 설치할 수 있습니다", "item.antarchy.lumen_bucket": "루멘 양동이", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "애벌레 생성 알", "item.antarchy.butterfly_spawn_egg": "나비 생성 알", "item.antarchy.brutalfly_spawn_egg": "브루털플라이 생성 알", - "item.antarchy.cloud_shark_spawn_egg": "구름 상어 생성 알", + "item.antarchy.stratoshark_spawn_egg": "구름 상어 생성 알", "item.antarchy.kraken_spawn_egg": "어, 안 돼. 하지 마.", "item.antarchy.missile_squid_spawn_egg": "미사일 오징어 생성 알", "item.antarchy.octopus_bomb_spawn_egg": "문어 폭탄 생성 알", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "흰개미가 목적지를 열 준비가 되었습니다.", "message.antarchy.termite_needs_reagent": "이 흰개미가 목적지를 열려면 시약이 필요합니다.", "death.attack.spit_bug_disrespect": "%1$s이(가) 스핏 벌레에게 무시당했습니다", - "death.attack.jumpy_bug_jump": "%1$s이(가) 점피 벌레에게 덮쳐졌습니다", + "death.attack.springbug_jump": "%1$s이(가) 점피 벌레에게 덮쳐졌습니다", "death.attack.hercules_beetle_obliteration": "%1$s이(가) 헤라클레스장수풍뎅이에게 소멸당했습니다", "message.antarchy.big_bertha.mode": "빅 버사 모드: %s", "message.antarchy.big_bertha.mode.basilisk": "바실리스크", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "성장", "effect.antarchy.bloodglass_ward": "혈유리 수호", "effect.antarchy.bloodglass_ward.description": "산산이 부서지는 하트를 부여해 피해 한 번을 통째로 흡수합니다. 시간이 지나면 다시 재생됩니다.", - "death.attack.triffid_mauling": "%1$s이(가) 식물에게 물어뜯겨 죽었습니다", - "death.attack.triffid_mauling.player": "%1$s이(가) 식물에게 물어뜯겨 죽었습니다", - "death.attack.triffid_swallow": "%1$s이(가) 트리피드에게 삼켜졌습니다", - "death.attack.triffid_swallow.player": "%1$s이(가) 트리피드에게 삼켜졌습니다", + "death.attack.flytrap_mauling": "%1$s이(가) 식물에게 물어뜯겨 죽었습니다", + "death.attack.flytrap_mauling.player": "%1$s이(가) 식물에게 물어뜯겨 죽었습니다", + "death.attack.flytrap_swallow": "%1$s이(가) 트리피드에게 삼켜졌습니다", + "death.attack.flytrap_swallow.player": "%1$s이(가) 트리피드에게 삼켜졌습니다", "potion.antarchy.haste": "성급함의 물약", "potion.antarchy.strong_haste": "강한 성급함의 물약", "tooltip.antarchy.big_bertha.mode": "모드: %s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "개미 뭅니다", "subtitles.antarchy.ant_gather": "개미 모읍니다", "subtitles.antarchy.ant_nest": "개미 둥지가 바스락거립니다", - "subtitles.antarchy.cloud_shark_bite": "구름 상어 뭅니다", - "subtitles.antarchy.cloud_shark_idle": "구름 상어 소리를 냅니다", - "subtitles.antarchy.cloud_shark_hurt": "구름 상어 다칩니다", - "subtitles.antarchy.cloud_shark_death": "구름 상어 죽습니다", - "subtitles.antarchy.cloud_shark_fly": "구름 상어 납니다", + "subtitles.antarchy.stratoshark_bite": "구름 상어 뭅니다", + "subtitles.antarchy.stratoshark_idle": "구름 상어 소리를 냅니다", + "subtitles.antarchy.stratoshark_hurt": "구름 상어 다칩니다", + "subtitles.antarchy.stratoshark_death": "구름 상어 죽습니다", + "subtitles.antarchy.stratoshark_fly": "구름 상어 납니다", "subtitles.antarchy.caterpillar_idle": "애벌레 소리를 냅니다", "subtitles.antarchy.caterpillar_hurt": "애벌레 다칩니다", "subtitles.antarchy.caterpillar_crawl": "애벌레 기어갑니다", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "악몽 죽습니다", "subtitles.antarchy.nightmare_bite": "악몽 뭅니다", "subtitles.antarchy.nightmare_flap": "악몽 날갯짓합니다", - "subtitles.antarchy.triffid_attack": "트리피드 공격합니다", - "subtitles.antarchy.triffid_grab": "트리피드 붙잡습니다", - "subtitles.antarchy.triffid_hurt": "트리피드 다칩니다", - "subtitles.antarchy.triffid_death": "트리피드 죽습니다", - "subtitles.antarchy.triffid_hiss": "트리피드 쉬익거립니다", - "subtitles.antarchy.triffid_growl": "트리피드 그르렁거립니다", + "subtitles.antarchy.flytrap_attack": "트리피드 공격합니다", + "subtitles.antarchy.flytrap_grab": "트리피드 붙잡습니다", + "subtitles.antarchy.flytrap_hurt": "트리피드 다칩니다", + "subtitles.antarchy.flytrap_death": "트리피드 죽습니다", + "subtitles.antarchy.flytrap_hiss": "트리피드 쉬익거립니다", + "subtitles.antarchy.flytrap_growl": "트리피드 그르렁거립니다", "subtitles.antarchy.gravity_gun_pickup": "중력총 들어 올립니다", "subtitles.antarchy.gravity_gun_drop": "중력총 내려놓습니다", "subtitles.antarchy.gravity_gun_hold_loop": "중력총 웅웅거립니다", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "호박색 지의류", "block.antarchy.bile_vein": "담즙 광맥", "block.antarchy.creepvine": "크리프바인", - "block.antarchy.creeping_horror_egg": "기어오는 공포 알", - "block.antarchy.lurking_terror_egg": "도사린 공포 알", + "block.antarchy.crawling_blight_egg": "기어오는 공포 알", + "block.antarchy.skulking_fright_egg": "도사린 공포 알", "entity.antarchy.termite": "흰개미", - "entity.antarchy.jumpy_bug": "점피 벌레", + "entity.antarchy.springbug": "점피 벌레", "entity.antarchy.spit_bug": "스핏 벌레", "entity.antarchy.stink_bug": "노린재", "entity.antarchy.rolly_polly": "공벌레", - "entity.antarchy.creeping_horror": "기어오는 공포", - "entity.antarchy.lurking_terror": "도사린 공포", + "entity.antarchy.crawling_blight": "기어오는 공포", + "entity.antarchy.skulking_fright": "도사린 공포", "entity.antarchy.hercules_beetle": "헤라클레스장수풍뎅이", - "item.antarchy.jumpy_bug_spawn_egg": "점피 벌레 생성 알", + "item.antarchy.springbug_spawn_egg": "점피 벌레 생성 알", "item.antarchy.spit_bug_spawn_egg": "스핏 벌레 생성 알", "item.antarchy.stink_bug_spawn_egg": "노린재 생성 알", "item.antarchy.termite_spawn_egg": "흰개미 생성 알", "item.antarchy.rolly_polly_spawn_egg": "공벌레 생성 알", - "item.antarchy.creeping_horror_spawn_egg": "기어오는 공포 생성 알", - "item.antarchy.lurking_terror_spawn_egg": "도사린 공포 생성 알", + "item.antarchy.crawling_blight_spawn_egg": "기어오는 공포 생성 알", + "item.antarchy.skulking_fright_spawn_egg": "도사린 공포 생성 알", "item.antarchy.hercules_beetle_spawn_egg": "헤라클레스장수풍뎅이 생성 알", "item.antarchy.chitin": "치텐", "block.antarchy.polished_broodstone": "윤나는 브루드스톤", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "글로우캡 버섯 블록", "block.antarchy.molting_vines": "탈피 덩굴", "item.antarchy.broodfruit": "브루드프루트", - "block.antarchy.jumpy_bug_egg": "점피 벌레 알", - "subtitles.antarchy.creeping_horror_growl": "기어오는 공포 그르렁거립니다", - "subtitles.antarchy.creeping_horror_hurt": "기어오는 공포 다칩니다", - "subtitles.antarchy.creeping_horror_bite": "기어오는 공포 뭅니다", - "subtitles.antarchy.lurking_terror_snarl": "도사린 공포 으르렁거립니다", - "subtitles.antarchy.lurking_terror_hurt": "도사린 공포 다칩니다", - "subtitles.antarchy.lurking_terror_bite": "도사린 공포 뭅니다", - "subtitles.antarchy.lurking_terror_fly_loop": "도사린 공포 납니다", + "block.antarchy.springbug_egg": "점피 벌레 알", + "subtitles.antarchy.crawling_blight_growl": "기어오는 공포 그르렁거립니다", + "subtitles.antarchy.crawling_blight_hurt": "기어오는 공포 다칩니다", + "subtitles.antarchy.crawling_blight_bite": "기어오는 공포 뭅니다", + "subtitles.antarchy.skulking_fright_snarl": "도사린 공포 으르렁거립니다", + "subtitles.antarchy.skulking_fright_hurt": "도사린 공포 다칩니다", + "subtitles.antarchy.skulking_fright_bite": "도사린 공포 뭅니다", + "subtitles.antarchy.skulking_fright_fly_loop": "도사린 공포 납니다", "subtitles.antarchy.stink_bug_fart": "노린재 방귀를 뀝니다", "subtitles.antarchy.stink_bug_idle": "노린재 소리를 냅니다", "subtitles.antarchy.rolly_polly_idle": "공벌레 소리를 냅니다", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "제리가 다칩니다", "subtitles.antarchy.jerry_death": "제리가 죽습니다", "subtitles.antarchy.jerry_attack": "제리가 공격합니다", - "subtitles.antarchy.jumpy_bug_idle": "점피 벌레 소리를 냅니다", + "subtitles.antarchy.springbug_idle": "점피 벌레 소리를 냅니다", "subtitles.antarchy.spit_bug_idle": "스핏 벌레 소리를 냅니다", - "subtitles.antarchy.jumpy_bug_hurt": "점피 벌레 다칩니다", - "subtitles.antarchy.jumpy_bug_jump": "점피 벌레 뜁니다", + "subtitles.antarchy.springbug_hurt": "점피 벌레 다칩니다", + "subtitles.antarchy.springbug_jump": "점피 벌레 뜁니다", "subtitles.antarchy.spit_bug_hurt": "스핏 벌레 다칩니다", "subtitles.antarchy.spit_bug_spit": "스핏 벌레 뱉습니다", "subtitles.antarchy.brutalfly_spit": "브루털플라이 뱉습니다", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/pt_br.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/pt_br.json index 18334091..55cf70c9 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/pt_br.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/pt_br.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "Nyxite pálido", "block.antarchy.nyxite_spike": "Espinho de Nyxite", "block.antarchy.potent_nyxite": "Nyxite potente", - "block.antarchy.triffid_goo_block": "Bloco de Triffid Gosma", + "block.antarchy.flytrap_goo_block": "Bloco de Flytrap Gosma", "block.antarchy.elythia_portal": "Portal de Elythia", "block.antarchy.cloud_block": "Bloco de Nuvem", "block.antarchy.thoraxis_portal": "Portal de Thoraxis", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "Formiga Arco-íris", "entity.antarchy.diamond_minecart": "O Carrinho de Diamante", "entity.antarchy.dr_trayaurus": "Dr. Trayaurus", - "entity.antarchy.cloud_shark": "Tubarão das Nuvens", + "entity.antarchy.stratoshark": "Tubarão das Nuvens", "entity.antarchy.kraken": "O Kraken", "entity.antarchy.missile_squid": "Lula-Míssil", "entity.antarchy.octopus_bomb": "Bomba-Polvo", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "Molevore", "entity.antarchy.mantis": "Louva-a-deus", "entity.antarchy.alpha_mantis": "Louva-a-deus Alfa", - "entity.antarchy.triffid": "Triffid", + "entity.antarchy.flytrap": "Flytrap", "entity.antarchy.toreterror": "Toreterror", "entity.antarchy.water_bomb": "Bomba d’Água", "subtitles.antarchy.mantis_ambient": "Louva-a-deus estala", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "Ajustador de Atitude", "tooltip.antarchy.attitude_adjuster.grounded": "Arremessa alvos no chão para cima e lança alvos no ar contra o chão.", "tooltip.antarchy.attitude_adjuster.slam": "Clique com o botão direito no ar para golpear o chão.", - "item.antarchy.cloud_shark_fin": "Barbatana de Tubarão das Nuvens", - "item.antarchy.cloud_shark_fin_soup": "Sopa de Barbatana de Tubarão das Nuvens", - "tooltip.antarchy.cloud_shark_fin_soup": "Concede Força e Queda Lenta.", + "item.antarchy.stratoshark_fin": "Barbatana de Tubarão das Nuvens", + "item.antarchy.stratoshark_fin_soup": "Sopa de Barbatana de Tubarão das Nuvens", + "tooltip.antarchy.stratoshark_fin_soup": "Concede Força e Queda Lenta.", "tooltip.antarchy.critter_cage.empty": "Clique com o botão direito para arremessar", "tooltip.antarchy.critter_cage.contains": "Contém: %s", "tooltip.antarchy.critter_cage.release": "Clique com o botão direito para soltar", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "Máximo de Corações de Vidro de Sangue", "item.antarchy.molevore_nose": "Nariz de Molevore", "item.antarchy.moleworm": "Moleworm", - "item.antarchy.triffid_spawn_egg": "Ovo Gerador de Triffid", + "item.antarchy.flytrap_spawn_egg": "Ovo Gerador de Flytrap", "item.antarchy.infested_rooted_dirt": "Enraizada Terra infestado", "item.antarchy.infested_coarse_dirt": "Estéril Terra infestado", "item.antarchy.pale_nyxite": "Nyxite pálido", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "Escama de Rei", "item.antarchy.queen_scale": "Escama de Rainha", - "item.antarchy.jumpy_bug_leg": "Perna de Inseto Saltador", - "item.antarchy.jumpy_boots": "Botas Saltadoras", - "tooltip.antarchy.jumpy_boots": "Agache-se para carregar e depois pule para saltar para cima.", + "item.antarchy.springbug_leg": "Perna de Inseto Saltador", + "item.antarchy.springy_boots": "Botas Saltadoras", + "tooltip.antarchy.springy_boots": "Agache-se para carregar e depois pule para saltar para cima.", "item.antarchy.brutalfly_wing": "Asa de Brutalfly", "item.antarchy.brutalfly_elytra": "Élitros de Brutalfly", "tooltip.antarchy.brutalfly_elytra.flap": "Enquanto voa, segure %s para bater as asas", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "%s Americano", "item.antarchy.root_beer": "Root Beer", "item.antarchy.primordial_scute": "Escama de Primordial", - "item.antarchy.triffid_goo": "Triffid Gosma", - "item.antarchy.triffid_goo_block": "Bloco de Triffid Gosma", - "tooltip.antarchy.triffid_goo_block": "Em alta velocidade, você quica para cima; caso contrário, afunda.", + "item.antarchy.flytrap_goo": "Flytrap Gosma", + "item.antarchy.flytrap_goo_block": "Bloco de Flytrap Gosma", + "tooltip.antarchy.flytrap_goo_block": "Em alta velocidade, você quica para cima; caso contrário, afunda.", "item.antarchy.cloud_bucket": "Balde de Nuvem", "tooltip.antarchy.cloud_bucket.midair": "Pode ser colocado no ar", "item.antarchy.lumen_bucket": "Balde de Lumen", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "Ovo Gerador de Lagarta", "item.antarchy.butterfly_spawn_egg": "Ovo Gerador de Borboleta", "item.antarchy.brutalfly_spawn_egg": "Ovo Gerador de Brutalfly", - "item.antarchy.cloud_shark_spawn_egg": "Ovo Gerador de Tubarão das Nuvens", + "item.antarchy.stratoshark_spawn_egg": "Ovo Gerador de Tubarão das Nuvens", "item.antarchy.kraken_spawn_egg": "Ah, não. Não faça isso.", "item.antarchy.missile_squid_spawn_egg": "Ovo Gerador de Lula-Míssil", "item.antarchy.octopus_bomb_spawn_egg": "Ovo Gerador de Bomba-Polvo", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "O cupim está pronto para abrir seu destino.", "message.antarchy.termite_needs_reagent": "Este cupim precisa de um reagente antes de abrir seu destino.", "death.attack.spit_bug_disrespect": "%1$s foi desrespeitado pelo Inseto Cuspidor", - "death.attack.jumpy_bug_jump": "%1$s foi atacado de salto pelo Inseto Saltador", + "death.attack.springbug_jump": "%1$s foi atacado de salto pelo Inseto Saltador", "death.attack.hercules_beetle_obliteration": "%1$s foi obliterado pelo Besouro-hércules", "message.antarchy.big_bertha.mode": "Modo da Big Bertha: %s", "message.antarchy.big_bertha.mode.basilisk": "Basilisco", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "Crescimento", "effect.antarchy.bloodglass_ward": "Guarda de Vidro de Sangue", "effect.antarchy.bloodglass_ward.description": "Concede corações que se estilhaçam, absorvendo um golpe inteiro de dano. Eles se regeneram com o tempo.", - "death.attack.triffid_mauling": "%1$s foi dilacerado até a morte por uma planta", - "death.attack.triffid_mauling.player": "%1$s foi dilacerado até a morte por uma planta", - "death.attack.triffid_swallow": "%1$s foi engolido por um Triffid", - "death.attack.triffid_swallow.player": "%1$s foi engolido por um Triffid", + "death.attack.flytrap_mauling": "%1$s foi dilacerado até a morte por uma planta", + "death.attack.flytrap_mauling.player": "%1$s foi dilacerado até a morte por uma planta", + "death.attack.flytrap_swallow": "%1$s foi engolido por um Flytrap", + "death.attack.flytrap_swallow.player": "%1$s foi engolido por um Flytrap", "potion.antarchy.haste": "Poção de Pressa", "potion.antarchy.strong_haste": "Poção Forte de Pressa", "tooltip.antarchy.big_bertha.mode": "Modo: %s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "Formigas mordem", "subtitles.antarchy.ant_gather": "Formigas coletam", "subtitles.antarchy.ant_nest": "Ninho de formigas farfalha", - "subtitles.antarchy.cloud_shark_bite": "Tubarão das Nuvens morde", - "subtitles.antarchy.cloud_shark_idle": "Tubarão das Nuvens faz barulho", - "subtitles.antarchy.cloud_shark_hurt": "Tubarão das Nuvens se machuca", - "subtitles.antarchy.cloud_shark_death": "Tubarão das Nuvens morre", - "subtitles.antarchy.cloud_shark_fly": "Tubarão das Nuvens voa", + "subtitles.antarchy.stratoshark_bite": "Tubarão das Nuvens morde", + "subtitles.antarchy.stratoshark_idle": "Tubarão das Nuvens faz barulho", + "subtitles.antarchy.stratoshark_hurt": "Tubarão das Nuvens se machuca", + "subtitles.antarchy.stratoshark_death": "Tubarão das Nuvens morre", + "subtitles.antarchy.stratoshark_fly": "Tubarão das Nuvens voa", "subtitles.antarchy.caterpillar_idle": "Lagarta faz barulho", "subtitles.antarchy.caterpillar_hurt": "Lagarta se machuca", "subtitles.antarchy.caterpillar_crawl": "Lagarta rasteja", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "Pesadelo morre", "subtitles.antarchy.nightmare_bite": "Pesadelo morde", "subtitles.antarchy.nightmare_flap": "Pesadelo bate as asas", - "subtitles.antarchy.triffid_attack": "Triffid ataca", - "subtitles.antarchy.triffid_grab": "Triffid agarra", - "subtitles.antarchy.triffid_hurt": "Triffid se machuca", - "subtitles.antarchy.triffid_death": "Triffid morre", - "subtitles.antarchy.triffid_hiss": "Triffid sibila", - "subtitles.antarchy.triffid_growl": "Triffid rosna", + "subtitles.antarchy.flytrap_attack": "Flytrap ataca", + "subtitles.antarchy.flytrap_grab": "Flytrap agarra", + "subtitles.antarchy.flytrap_hurt": "Flytrap se machuca", + "subtitles.antarchy.flytrap_death": "Flytrap morre", + "subtitles.antarchy.flytrap_hiss": "Flytrap sibila", + "subtitles.antarchy.flytrap_growl": "Flytrap rosna", "subtitles.antarchy.gravity_gun_pickup": "Arma Gravitacional pega", "subtitles.antarchy.gravity_gun_drop": "Arma Gravitacional solta", "subtitles.antarchy.gravity_gun_hold_loop": "Arma Gravitacional zune", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "Líquen Âmbar", "block.antarchy.bile_vein": "Veio de Bile", "block.antarchy.creepvine": "Trepadeira Rastejante", - "block.antarchy.creeping_horror_egg": "Ovo de Horror Rastejante", - "block.antarchy.lurking_terror_egg": "Ovo de Terror à Espreita", + "block.antarchy.crawling_blight_egg": "Ovo de Horror Rastejante", + "block.antarchy.skulking_fright_egg": "Ovo de Terror à Espreita", "entity.antarchy.termite": "Cupim", - "entity.antarchy.jumpy_bug": "Inseto Saltador", + "entity.antarchy.springbug": "Inseto Saltador", "entity.antarchy.spit_bug": "Inseto Cuspidor", "entity.antarchy.stink_bug": "Percevejo-fedorento", "entity.antarchy.rolly_polly": "Tatuzinho-de-jardim", - "entity.antarchy.creeping_horror": "Horror Rastejante", - "entity.antarchy.lurking_terror": "Terror à Espreita", + "entity.antarchy.crawling_blight": "Horror Rastejante", + "entity.antarchy.skulking_fright": "Terror à Espreita", "entity.antarchy.hercules_beetle": "Besouro-hércules", - "item.antarchy.jumpy_bug_spawn_egg": "Ovo Gerador de Inseto Saltador", + "item.antarchy.springbug_spawn_egg": "Ovo Gerador de Inseto Saltador", "item.antarchy.spit_bug_spawn_egg": "Ovo Gerador de Inseto Cuspidor", "item.antarchy.stink_bug_spawn_egg": "Ovo Gerador de Percevejo-fedorento", "item.antarchy.termite_spawn_egg": "Ovo Gerador de Cupim", "item.antarchy.rolly_polly_spawn_egg": "Ovo Gerador de Tatuzinho-de-jardim", - "item.antarchy.creeping_horror_spawn_egg": "Ovo Gerador de Horror Rastejante", - "item.antarchy.lurking_terror_spawn_egg": "Ovo Gerador de Terror à Espreita", + "item.antarchy.crawling_blight_spawn_egg": "Ovo Gerador de Horror Rastejante", + "item.antarchy.skulking_fright_spawn_egg": "Ovo Gerador de Terror à Espreita", "item.antarchy.hercules_beetle_spawn_egg": "Ovo Gerador de Besouro-hércules", "item.antarchy.chitin": "Quitina", "block.antarchy.polished_broodstone": "Broodstone polido", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "Bloco de Cogumelo Brilhachapéu", "block.antarchy.molting_vines": "Trepadeiras de Muda", "item.antarchy.broodfruit": "Fruto da Ninhada", - "block.antarchy.jumpy_bug_egg": "Ovo de Inseto Saltador", - "subtitles.antarchy.creeping_horror_growl": "Horror Rastejante rosna", - "subtitles.antarchy.creeping_horror_hurt": "Horror Rastejante se machuca", - "subtitles.antarchy.creeping_horror_bite": "Horror Rastejante morde", - "subtitles.antarchy.lurking_terror_snarl": "Terror à Espreita rosna", - "subtitles.antarchy.lurking_terror_hurt": "Terror à Espreita se machuca", - "subtitles.antarchy.lurking_terror_bite": "Terror à Espreita morde", - "subtitles.antarchy.lurking_terror_fly_loop": "Terror à Espreita voa", + "block.antarchy.springbug_egg": "Ovo de Inseto Saltador", + "subtitles.antarchy.crawling_blight_growl": "Horror Rastejante rosna", + "subtitles.antarchy.crawling_blight_hurt": "Horror Rastejante se machuca", + "subtitles.antarchy.crawling_blight_bite": "Horror Rastejante morde", + "subtitles.antarchy.skulking_fright_snarl": "Terror à Espreita rosna", + "subtitles.antarchy.skulking_fright_hurt": "Terror à Espreita se machuca", + "subtitles.antarchy.skulking_fright_bite": "Terror à Espreita morde", + "subtitles.antarchy.skulking_fright_fly_loop": "Terror à Espreita voa", "subtitles.antarchy.stink_bug_fart": "Percevejo-fedorento solta pum", "subtitles.antarchy.stink_bug_idle": "Percevejo-fedorento faz barulho", "subtitles.antarchy.rolly_polly_idle": "Tatuzinho-de-jardim faz barulho", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "Jerry se machuca", "subtitles.antarchy.jerry_death": "Jerry morre", "subtitles.antarchy.jerry_attack": "Jerry ataca", - "subtitles.antarchy.jumpy_bug_idle": "Inseto Saltador faz barulho", + "subtitles.antarchy.springbug_idle": "Inseto Saltador faz barulho", "subtitles.antarchy.spit_bug_idle": "Inseto Cuspidor faz barulho", - "subtitles.antarchy.jumpy_bug_hurt": "Inseto Saltador se machuca", - "subtitles.antarchy.jumpy_bug_jump": "Inseto Saltador salta", + "subtitles.antarchy.springbug_hurt": "Inseto Saltador se machuca", + "subtitles.antarchy.springbug_jump": "Inseto Saltador salta", "subtitles.antarchy.spit_bug_hurt": "Inseto Cuspidor se machuca", "subtitles.antarchy.spit_bug_spit": "Inseto Cuspidor cospe", "subtitles.antarchy.brutalfly_spit": "Brutalfly cospe", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/ru_ru.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/ru_ru.json index fe387005..1bc3167c 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/ru_ru.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/ru_ru.json @@ -84,7 +84,7 @@ "block.antarchy.pale_nyxite": "Бледный никсит", "block.antarchy.nyxite_spike": "Никситовый шип", "block.antarchy.potent_nyxite": "Насыщенный никсит", - "block.antarchy.triffid_goo_block": "Блок слизи триффида", + "block.antarchy.flytrap_goo_block": "Блок слизи триффида", "block.antarchy.elythia_portal": "Портал в Элитию", "block.antarchy.cloud_block": "Облачный блок", "block.antarchy.thoraxis_portal": "Портал в Тораксис", @@ -170,7 +170,7 @@ "entity.antarchy.rainbow_ant": "Радужный муравей", "entity.antarchy.diamond_minecart": "Алмазная вагонетка", "entity.antarchy.dr_trayaurus": "Доктор Траяурус", - "entity.antarchy.cloud_shark": "Облачная акула", + "entity.antarchy.stratoshark": "Облачная акула", "entity.antarchy.kraken": "Кракен", "entity.antarchy.missile_squid": "Кальмар-ракета", "entity.antarchy.octopus_bomb": "Осьминог-бомба", @@ -182,7 +182,7 @@ "entity.antarchy.molevore": "Кротожор", "entity.antarchy.mantis": "Богомол", "entity.antarchy.alpha_mantis": "Альфа-богомол", - "entity.antarchy.triffid": "Триффид", + "entity.antarchy.flytrap": "Триффид", "entity.antarchy.toreterror": "Тортеррор", "entity.antarchy.water_bomb": "Водяная бомба", "subtitles.antarchy.mantis_ambient": "Богомол щёлкает", @@ -198,9 +198,9 @@ "item.antarchy.big_bertha_handle": "Рукоять Большой Берты", "item.antarchy.big_bertha_hilt": "Эфес Большой Берты", "item.antarchy.battle_axe": "Боевой топор", - "item.antarchy.cloud_shark_fin": "Плавник облачной акулы", - "item.antarchy.cloud_shark_fin_soup": "Суп из плавников облачной акулы", - "tooltip.antarchy.cloud_shark_fin_soup": "Даёт Силу и Плавное падение.", + "item.antarchy.stratoshark_fin": "Плавник облачной акулы", + "item.antarchy.stratoshark_fin_soup": "Суп из плавников облачной акулы", + "tooltip.antarchy.stratoshark_fin_soup": "Даёт Силу и Плавное падение.", "item.antarchy.kraken_tooth": "Зуб кракена", "item.antarchy.basilisk_fang": "Клык василиска", "item.antarchy.basilisk_dagger": "Кинжал василиска", @@ -240,7 +240,7 @@ "attribute.antarchy.bloodglass_max_hearts": "Макс. сердец кровавого стекла", "item.antarchy.molevore_nose": "Нос кротожора", "item.antarchy.moleworm": "Кроточервь", - "item.antarchy.triffid_spawn_egg": "Яйцо призыва триффида", + "item.antarchy.flytrap_spawn_egg": "Яйцо призыва триффида", "item.antarchy.infested_rooted_dirt": "Заражённая корнями земля", "item.antarchy.infested_coarse_dirt": "Заражённая каменистая земля", "item.antarchy.pale_nyxite": "Бледный никсит", @@ -329,9 +329,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "Чешуйка короля", "item.antarchy.queen_scale": "Чешуйка королевы", - "item.antarchy.jumpy_bug_leg": "Ножка прыгучего жука", - "item.antarchy.jumpy_boots": "Прыгучие ботинки", - "tooltip.antarchy.jumpy_boots": "Зажмите Shift, чтобы зарядить, затем прыгните, чтобы взмыть вверх.", + "item.antarchy.springbug_leg": "Ножка прыгучего жука", + "item.antarchy.springy_boots": "Прыгучие ботинки", + "tooltip.antarchy.springy_boots": "Зажмите Shift, чтобы зарядить, затем прыгните, чтобы взмыть вверх.", "item.antarchy.brutalfly_wing": "Крыло жестококрыла", "item.antarchy.brutalfly_elytra": "Элитры жестококрыла", "tooltip.antarchy.brutalfly_elytra.flap": "Во время полёта зажмите %s, чтобы махать крыльями", @@ -345,9 +345,9 @@ "item.antarchy.american_name": "Американский %s", "item.antarchy.root_beer": "Рутбир", "item.antarchy.primordial_scute": "Первобытный щиток", - "item.antarchy.triffid_goo": "Слизь триффида", - "item.antarchy.triffid_goo_block": "Блок слизи триффида", - "tooltip.antarchy.triffid_goo_block": "При высокой скорости отталкивает вверх, иначе засасывает.", + "item.antarchy.flytrap_goo": "Слизь триффида", + "item.antarchy.flytrap_goo_block": "Блок слизи триффида", + "tooltip.antarchy.flytrap_goo_block": "При высокой скорости отталкивает вверх, иначе засасывает.", "item.antarchy.cloud_bucket": "Ведро облаков", "tooltip.antarchy.cloud_bucket.midair": "Можно разместить прямо в воздухе", "item.antarchy.lumen_bucket": "Ведро люмена", @@ -450,7 +450,7 @@ "item.antarchy.caterpillar_spawn_egg": "Яйцо призыва гусеницы", "item.antarchy.butterfly_spawn_egg": "Яйцо призыва бабочки", "item.antarchy.brutalfly_spawn_egg": "Яйцо призыва жестококрыла", - "item.antarchy.cloud_shark_spawn_egg": "Яйцо призыва облачной акулы", + "item.antarchy.stratoshark_spawn_egg": "Яйцо призыва облачной акулы", "item.antarchy.kraken_spawn_egg": "Ох, нет. Не стоит.", "item.antarchy.missile_squid_spawn_egg": "Яйцо призыва кальмара-ракеты", "item.antarchy.octopus_bomb_spawn_egg": "Яйцо призыва осьминога-бомбы", @@ -513,10 +513,10 @@ "effect.antarchy.growth": "Увеличение", "effect.antarchy.bloodglass_ward": "Защита кровавого стекла", "effect.antarchy.bloodglass_ward.description": "Дает сердца, которые разбиваются и полностью поглощают один удар. Со временем они восстанавливаются.", - "death.attack.triffid_mauling": "%1$s был растерзан растением", - "death.attack.triffid_mauling.player": "%1$s был растерзан растением", - "death.attack.triffid_swallow": "%1$s был проглочен триффидом", - "death.attack.triffid_swallow.player": "%1$s был проглочен триффидом", + "death.attack.flytrap_mauling": "%1$s был растерзан растением", + "death.attack.flytrap_mauling.player": "%1$s был растерзан растением", + "death.attack.flytrap_swallow": "%1$s был проглочен триффидом", + "death.attack.flytrap_swallow.player": "%1$s был проглочен триффидом", "potion.antarchy.haste": "Зелье спешки", "potion.antarchy.strong_haste": "Мощное зелье спешки", "tooltip.antarchy.big_bertha.mode": "Режим: %s", @@ -631,11 +631,11 @@ "subtitles.antarchy.ant_bite": "Муравьи кусают", "subtitles.antarchy.ant_gather": "Муравьи собираются", "subtitles.antarchy.ant_nest": "Муравейник шуршит", - "subtitles.antarchy.cloud_shark_bite": "Облачная акула кусает", - "subtitles.antarchy.cloud_shark_idle": "Облачная акула парит", - "subtitles.antarchy.cloud_shark_hurt": "Облачной акуле больно", - "subtitles.antarchy.cloud_shark_death": "Облачная акула умирает", - "subtitles.antarchy.cloud_shark_fly": "Облачная акула летит", + "subtitles.antarchy.stratoshark_bite": "Облачная акула кусает", + "subtitles.antarchy.stratoshark_idle": "Облачная акула парит", + "subtitles.antarchy.stratoshark_hurt": "Облачной акуле больно", + "subtitles.antarchy.stratoshark_death": "Облачная акула умирает", + "subtitles.antarchy.stratoshark_fly": "Облачная акула летит", "subtitles.antarchy.caterpillar_idle": "Гусеница шевелится", "subtitles.antarchy.caterpillar_hurt": "Гусенице больно", "subtitles.antarchy.caterpillar_crawl": "Гусеница ползёт", @@ -675,12 +675,12 @@ "subtitles.antarchy.nightmare_death": "Кошмар умирает", "subtitles.antarchy.nightmare_bite": "Кошмар кусает", "subtitles.antarchy.nightmare_flap": "Кошмар машет крыльями", - "subtitles.antarchy.triffid_attack": "Триффид атакует", - "subtitles.antarchy.triffid_grab": "Триффид хватает", - "subtitles.antarchy.triffid_hurt": "Триффиду больно", - "subtitles.antarchy.triffid_death": "Триффид умирает", - "subtitles.antarchy.triffid_hiss": "Триффид шипит", - "subtitles.antarchy.triffid_growl": "Триффид урчит", + "subtitles.antarchy.flytrap_attack": "Триффид атакует", + "subtitles.antarchy.flytrap_grab": "Триффид хватает", + "subtitles.antarchy.flytrap_hurt": "Триффиду больно", + "subtitles.antarchy.flytrap_death": "Триффид умирает", + "subtitles.antarchy.flytrap_hiss": "Триффид шипит", + "subtitles.antarchy.flytrap_growl": "Триффид урчит", "subtitles.antarchy.gravity_gun_pickup": "Пушка притягивает", "subtitles.antarchy.gravity_gun_drop": "Пушка отпускает", "subtitles.antarchy.gravity_gun_hold_loop": "Пушка гудит", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_cn.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_cn.json index ee461c37..bde52c13 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_cn.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_cn.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "苍白尼克赛特", "block.antarchy.nyxite_spike": "尼克赛特尖刺", "block.antarchy.potent_nyxite": "强效尼克赛特", - "block.antarchy.triffid_goo_block": "特里菲德 黏液块", + "block.antarchy.flytrap_goo_block": "特里菲德 黏液块", "block.antarchy.elythia_portal": "艾莉提娅传送门", "block.antarchy.cloud_block": "云块", "block.antarchy.thoraxis_portal": "索尔阿克西斯传送门", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "彩虹蚂蚁", "entity.antarchy.diamond_minecart": "钻石矿车", "entity.antarchy.dr_trayaurus": "特雷奥勒斯博士", - "entity.antarchy.cloud_shark": "云鲨", + "entity.antarchy.stratoshark": "云鲨", "entity.antarchy.kraken": "克拉肯", "entity.antarchy.missile_squid": "导弹鱿鱼", "entity.antarchy.octopus_bomb": "章鱼炸弹", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "莫尔沃尔", "entity.antarchy.mantis": "螳螂", "entity.antarchy.alpha_mantis": "阿尔法螳螂", - "entity.antarchy.triffid": "特里菲德", + "entity.antarchy.flytrap": "特里菲德", "entity.antarchy.toreterror": "托尔泰罗尔", "entity.antarchy.water_bomb": "水炸弹", "subtitles.antarchy.mantis_ambient": "螳螂发出咔嗒声", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "态度调整锤", "tooltip.antarchy.attitude_adjuster.grounded": "将地面上的目标击飞，并把空中的目标砸向地面。", "tooltip.antarchy.attitude_adjuster.slam": "在空中右键可发动落地重击。", - "item.antarchy.cloud_shark_fin": "云鲨鳍", - "item.antarchy.cloud_shark_fin_soup": "云鲨鳍汤", - "tooltip.antarchy.cloud_shark_fin_soup": "获得力量与缓降。", + "item.antarchy.stratoshark_fin": "云鲨鳍", + "item.antarchy.stratoshark_fin_soup": "云鲨鳍汤", + "tooltip.antarchy.stratoshark_fin_soup": "获得力量与缓降。", "tooltip.antarchy.critter_cage.empty": "右键投掷", "tooltip.antarchy.critter_cage.contains": "装有：%s", "tooltip.antarchy.critter_cage.release": "右键释放", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "血晶之心上限", "item.antarchy.molevore_nose": "莫尔沃尔鼻子", "item.antarchy.moleworm": "莫尔沃姆", - "item.antarchy.triffid_spawn_egg": "特里菲德刷怪蛋", + "item.antarchy.flytrap_spawn_egg": "特里菲德刷怪蛋", "item.antarchy.infested_rooted_dirt": "虫蚀缠根 泥土", "item.antarchy.infested_coarse_dirt": "虫蚀砂土 泥土", "item.antarchy.pale_nyxite": "苍白尼克赛特", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "国王鳞片", "item.antarchy.queen_scale": "女王鳞片", - "item.antarchy.jumpy_bug_leg": "跳跳虫腿", - "item.antarchy.jumpy_boots": "弹跳靴", - "tooltip.antarchy.jumpy_boots": "潜行蓄力，然后跳跃即可向上弹射。", + "item.antarchy.springbug_leg": "跳跳虫腿", + "item.antarchy.springy_boots": "弹跳靴", + "tooltip.antarchy.springy_boots": "潜行蓄力，然后跳跃即可向上弹射。", "item.antarchy.brutalfly_wing": "布鲁塔尔弗莱翼", "item.antarchy.brutalfly_elytra": "布鲁塔尔弗莱鞘翅", "tooltip.antarchy.brutalfly_elytra.flap": "飞行时按住%s拍动翅膀", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "美式%s", "item.antarchy.root_beer": "根汁汽水", "item.antarchy.primordial_scute": "原初甲片", - "item.antarchy.triffid_goo": "特里菲德 黏液", - "item.antarchy.triffid_goo_block": "特里菲德 黏液块", - "tooltip.antarchy.triffid_goo_block": "高速接触时会向上弹起，否则会沉入其中。", + "item.antarchy.flytrap_goo": "特里菲德 黏液", + "item.antarchy.flytrap_goo_block": "特里菲德 黏液块", + "tooltip.antarchy.flytrap_goo_block": "高速接触时会向上弹起，否则会沉入其中。", "item.antarchy.cloud_bucket": "云桶", "tooltip.antarchy.cloud_bucket.midair": "可放置在空中", "item.antarchy.lumen_bucket": "卢门桶", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "毛毛虫刷怪蛋", "item.antarchy.butterfly_spawn_egg": "蝴蝶刷怪蛋", "item.antarchy.brutalfly_spawn_egg": "布鲁塔尔弗莱刷怪蛋", - "item.antarchy.cloud_shark_spawn_egg": "云鲨刷怪蛋", + "item.antarchy.stratoshark_spawn_egg": "云鲨刷怪蛋", "item.antarchy.kraken_spawn_egg": "呃，不。别这样。", "item.antarchy.missile_squid_spawn_egg": "导弹鱿鱼刷怪蛋", "item.antarchy.octopus_bomb_spawn_egg": "章鱼炸弹刷怪蛋", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "白蚁已准备好开启目的地。", "message.antarchy.termite_needs_reagent": "这只白蚁需要试剂才能开启目的地。", "death.attack.spit_bug_disrespect": "%1$s遭到了喷吐虫的羞辱", - "death.attack.jumpy_bug_jump": "%1$s被跳跳虫扑倒了", + "death.attack.springbug_jump": "%1$s被跳跳虫扑倒了", "death.attack.hercules_beetle_obliteration": "%1$s被赫拉克勒斯甲虫彻底摧毁", "message.antarchy.big_bertha.mode": "大贝莎模式：%s", "message.antarchy.big_bertha.mode.basilisk": "蛇怪", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "生长", "effect.antarchy.bloodglass_ward": "血晶守护", "effect.antarchy.bloodglass_ward.description": "给予会破碎的心，能吸收整整一次伤害。它们会随时间恢复。", - "death.attack.triffid_mauling": "%1$s被一株植物撕咬致死", - "death.attack.triffid_mauling.player": "%1$s被一株植物撕咬致死", - "death.attack.triffid_swallow": "%1$s被特里菲德吞下了", - "death.attack.triffid_swallow.player": "%1$s被特里菲德吞下了", + "death.attack.flytrap_mauling": "%1$s被一株植物撕咬致死", + "death.attack.flytrap_mauling.player": "%1$s被一株植物撕咬致死", + "death.attack.flytrap_swallow": "%1$s被特里菲德吞下了", + "death.attack.flytrap_swallow.player": "%1$s被特里菲德吞下了", "potion.antarchy.haste": "急迫药水", "potion.antarchy.strong_haste": "强效急迫药水", "tooltip.antarchy.big_bertha.mode": "模式：%s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "蚂蚁啃咬", "subtitles.antarchy.ant_gather": "蚂蚁采集", "subtitles.antarchy.ant_nest": "蚁巢沙沙作响", - "subtitles.antarchy.cloud_shark_bite": "云鲨啃咬", - "subtitles.antarchy.cloud_shark_idle": "云鲨发出动静", - "subtitles.antarchy.cloud_shark_hurt": "云鲨受伤", - "subtitles.antarchy.cloud_shark_death": "云鲨死亡", - "subtitles.antarchy.cloud_shark_fly": "云鲨飞行", + "subtitles.antarchy.stratoshark_bite": "云鲨啃咬", + "subtitles.antarchy.stratoshark_idle": "云鲨发出动静", + "subtitles.antarchy.stratoshark_hurt": "云鲨受伤", + "subtitles.antarchy.stratoshark_death": "云鲨死亡", + "subtitles.antarchy.stratoshark_fly": "云鲨飞行", "subtitles.antarchy.caterpillar_idle": "毛毛虫发出动静", "subtitles.antarchy.caterpillar_hurt": "毛毛虫受伤", "subtitles.antarchy.caterpillar_crawl": "毛毛虫爬行", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "梦魇死亡", "subtitles.antarchy.nightmare_bite": "梦魇啃咬", "subtitles.antarchy.nightmare_flap": "梦魇振翅", - "subtitles.antarchy.triffid_attack": "特里菲德攻击", - "subtitles.antarchy.triffid_grab": "特里菲德抓取", - "subtitles.antarchy.triffid_hurt": "特里菲德受伤", - "subtitles.antarchy.triffid_death": "特里菲德死亡", - "subtitles.antarchy.triffid_hiss": "特里菲德嘶嘶作响", - "subtitles.antarchy.triffid_growl": "特里菲德咆哮", + "subtitles.antarchy.flytrap_attack": "特里菲德攻击", + "subtitles.antarchy.flytrap_grab": "特里菲德抓取", + "subtitles.antarchy.flytrap_hurt": "特里菲德受伤", + "subtitles.antarchy.flytrap_death": "特里菲德死亡", + "subtitles.antarchy.flytrap_hiss": "特里菲德嘶嘶作响", + "subtitles.antarchy.flytrap_growl": "特里菲德咆哮", "subtitles.antarchy.gravity_gun_pickup": "重力枪拾取", "subtitles.antarchy.gravity_gun_drop": "重力枪放下", "subtitles.antarchy.gravity_gun_hold_loop": "重力枪嗡鸣", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "琥珀地衣", "block.antarchy.bile_vein": "胆汁矿脉", "block.antarchy.creepvine": "爬藤", - "block.antarchy.creeping_horror_egg": "爬行恐魔蛋", - "block.antarchy.lurking_terror_egg": "潜伏恐魔蛋", + "block.antarchy.crawling_blight_egg": "爬行恐魔蛋", + "block.antarchy.skulking_fright_egg": "潜伏恐魔蛋", "entity.antarchy.termite": "白蚁", - "entity.antarchy.jumpy_bug": "跳跳虫", + "entity.antarchy.springbug": "跳跳虫", "entity.antarchy.spit_bug": "喷吐虫", "entity.antarchy.stink_bug": "臭屁虫", "entity.antarchy.rolly_polly": "鼠妇", - "entity.antarchy.creeping_horror": "爬行恐魔", - "entity.antarchy.lurking_terror": "潜伏恐魔", + "entity.antarchy.crawling_blight": "爬行恐魔", + "entity.antarchy.skulking_fright": "潜伏恐魔", "entity.antarchy.hercules_beetle": "赫拉克勒斯甲虫", - "item.antarchy.jumpy_bug_spawn_egg": "跳跳虫刷怪蛋", + "item.antarchy.springbug_spawn_egg": "跳跳虫刷怪蛋", "item.antarchy.spit_bug_spawn_egg": "喷吐虫刷怪蛋", "item.antarchy.stink_bug_spawn_egg": "臭屁虫刷怪蛋", "item.antarchy.termite_spawn_egg": "白蚁刷怪蛋", "item.antarchy.rolly_polly_spawn_egg": "鼠妇刷怪蛋", - "item.antarchy.creeping_horror_spawn_egg": "爬行恐魔刷怪蛋", - "item.antarchy.lurking_terror_spawn_egg": "潜伏恐魔刷怪蛋", + "item.antarchy.crawling_blight_spawn_egg": "爬行恐魔刷怪蛋", + "item.antarchy.skulking_fright_spawn_egg": "潜伏恐魔刷怪蛋", "item.antarchy.hercules_beetle_spawn_egg": "赫拉克勒斯甲虫刷怪蛋", "item.antarchy.chitin": "甲壳素", "block.antarchy.polished_broodstone": "磨制布鲁德斯通", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "荧光菌盖蘑菇块", "block.antarchy.molting_vines": "蜕皮藤蔓", "item.antarchy.broodfruit": "育巢果", - "block.antarchy.jumpy_bug_egg": "跳跳虫蛋", - "subtitles.antarchy.creeping_horror_growl": "爬行恐魔咆哮", - "subtitles.antarchy.creeping_horror_hurt": "爬行恐魔受伤", - "subtitles.antarchy.creeping_horror_bite": "爬行恐魔啃咬", - "subtitles.antarchy.lurking_terror_snarl": "潜伏恐魔低吼", - "subtitles.antarchy.lurking_terror_hurt": "潜伏恐魔受伤", - "subtitles.antarchy.lurking_terror_bite": "潜伏恐魔啃咬", - "subtitles.antarchy.lurking_terror_fly_loop": "潜伏恐魔飞行", + "block.antarchy.springbug_egg": "跳跳虫蛋", + "subtitles.antarchy.crawling_blight_growl": "爬行恐魔咆哮", + "subtitles.antarchy.crawling_blight_hurt": "爬行恐魔受伤", + "subtitles.antarchy.crawling_blight_bite": "爬行恐魔啃咬", + "subtitles.antarchy.skulking_fright_snarl": "潜伏恐魔低吼", + "subtitles.antarchy.skulking_fright_hurt": "潜伏恐魔受伤", + "subtitles.antarchy.skulking_fright_bite": "潜伏恐魔啃咬", + "subtitles.antarchy.skulking_fright_fly_loop": "潜伏恐魔飞行", "subtitles.antarchy.stink_bug_fart": "臭屁虫放屁", "subtitles.antarchy.stink_bug_idle": "臭屁虫发出动静", "subtitles.antarchy.rolly_polly_idle": "鼠妇发出动静", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "杰瑞受伤", "subtitles.antarchy.jerry_death": "杰瑞死亡", "subtitles.antarchy.jerry_attack": "杰瑞攻击", - "subtitles.antarchy.jumpy_bug_idle": "跳跳虫发出动静", + "subtitles.antarchy.springbug_idle": "跳跳虫发出动静", "subtitles.antarchy.spit_bug_idle": "喷吐虫发出动静", - "subtitles.antarchy.jumpy_bug_hurt": "跳跳虫受伤", - "subtitles.antarchy.jumpy_bug_jump": "跳跳虫跳跃", + "subtitles.antarchy.springbug_hurt": "跳跳虫受伤", + "subtitles.antarchy.springbug_jump": "跳跳虫跳跃", "subtitles.antarchy.spit_bug_hurt": "喷吐虫受伤", "subtitles.antarchy.spit_bug_spit": "喷吐虫喷吐", "subtitles.antarchy.brutalfly_spit": "布鲁塔尔弗莱喷吐", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_tw.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_tw.json index fcaf04ab..2c3a6435 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_tw.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/zh_tw.json @@ -90,7 +90,7 @@ "block.antarchy.pale_nyxite": "蒼白尼克賽特", "block.antarchy.nyxite_spike": "尼克賽特尖刺", "block.antarchy.potent_nyxite": "強效尼克賽特", - "block.antarchy.triffid_goo_block": "特里菲德 黏液塊", + "block.antarchy.flytrap_goo_block": "特里菲德 黏液塊", "block.antarchy.elythia_portal": "艾莉提婭傳送門", "block.antarchy.cloud_block": "雲塊", "block.antarchy.thoraxis_portal": "索爾阿克西斯傳送門", @@ -181,7 +181,7 @@ "entity.antarchy.rainbow_ant": "彩虹螞蟻", "entity.antarchy.diamond_minecart": "鑽石礦車", "entity.antarchy.dr_trayaurus": "特雷奧勒斯博士", - "entity.antarchy.cloud_shark": "雲鯊", + "entity.antarchy.stratoshark": "雲鯊", "entity.antarchy.kraken": "克拉肯", "entity.antarchy.missile_squid": "導彈魷魚", "entity.antarchy.octopus_bomb": "章魚炸彈", @@ -193,7 +193,7 @@ "entity.antarchy.molevore": "莫爾沃爾", "entity.antarchy.mantis": "螳螂", "entity.antarchy.alpha_mantis": "阿爾法螳螂", - "entity.antarchy.triffid": "特里菲德", + "entity.antarchy.flytrap": "特里菲德", "entity.antarchy.toreterror": "托爾泰羅爾", "entity.antarchy.water_bomb": "水炸彈", "subtitles.antarchy.mantis_ambient": "螳螂發出咔嗒聲", @@ -212,9 +212,9 @@ "item.antarchy.attitude_adjuster": "態度調整錘", "tooltip.antarchy.attitude_adjuster.grounded": "將地面上的目標擊飛，並把空中的目標砸向地面。", "tooltip.antarchy.attitude_adjuster.slam": "在空中右鍵可發動落地重擊。", - "item.antarchy.cloud_shark_fin": "雲鯊鰭", - "item.antarchy.cloud_shark_fin_soup": "雲鯊鰭湯", - "tooltip.antarchy.cloud_shark_fin_soup": "獲得力量與緩降。", + "item.antarchy.stratoshark_fin": "雲鯊鰭", + "item.antarchy.stratoshark_fin_soup": "雲鯊鰭湯", + "tooltip.antarchy.stratoshark_fin_soup": "獲得力量與緩降。", "tooltip.antarchy.critter_cage.empty": "右鍵投擲", "tooltip.antarchy.critter_cage.contains": "裝有：%s", "tooltip.antarchy.critter_cage.release": "右鍵釋放", @@ -263,7 +263,7 @@ "attribute.antarchy.bloodglass_max_hearts": "血晶之心上限", "item.antarchy.molevore_nose": "莫爾沃爾鼻子", "item.antarchy.moleworm": "莫爾沃姆", - "item.antarchy.triffid_spawn_egg": "特里菲德刷怪蛋", + "item.antarchy.flytrap_spawn_egg": "特里菲德刷怪蛋", "item.antarchy.infested_rooted_dirt": "蟲蝕纏根 泥土", "item.antarchy.infested_coarse_dirt": "蟲蝕砂土 泥土", "item.antarchy.pale_nyxite": "蒼白尼克賽特", @@ -352,9 +352,9 @@ "tooltip.antarchy.mantis_claw.wall_cling": "Dual wield to cling to walls and jump upward.", "item.antarchy.king_scale": "國王鱗片", "item.antarchy.queen_scale": "女王鱗片", - "item.antarchy.jumpy_bug_leg": "跳跳蟲腿", - "item.antarchy.jumpy_boots": "彈跳靴", - "tooltip.antarchy.jumpy_boots": "潛行蓄力，然後跳躍即可向上彈射。", + "item.antarchy.springbug_leg": "跳跳蟲腿", + "item.antarchy.springy_boots": "彈跳靴", + "tooltip.antarchy.springy_boots": "潛行蓄力，然後跳躍即可向上彈射。", "item.antarchy.brutalfly_wing": "布魯塔爾弗萊翼", "item.antarchy.brutalfly_elytra": "布魯塔爾弗萊鞘翅", "tooltip.antarchy.brutalfly_elytra.flap": "飛行時按住%s拍動翅膀", @@ -368,9 +368,9 @@ "item.antarchy.american_name": "美式%s", "item.antarchy.root_beer": "根汁汽水", "item.antarchy.primordial_scute": "原初甲片", - "item.antarchy.triffid_goo": "特里菲德 黏液", - "item.antarchy.triffid_goo_block": "特里菲德 黏液塊", - "tooltip.antarchy.triffid_goo_block": "高速接觸時會向上彈起，否則會沉入其中。", + "item.antarchy.flytrap_goo": "特里菲德 黏液", + "item.antarchy.flytrap_goo_block": "特里菲德 黏液塊", + "tooltip.antarchy.flytrap_goo_block": "高速接觸時會向上彈起，否則會沉入其中。", "item.antarchy.cloud_bucket": "雲桶", "tooltip.antarchy.cloud_bucket.midair": "可放置在空中", "item.antarchy.lumen_bucket": "盧門桶", @@ -474,7 +474,7 @@ "item.antarchy.caterpillar_spawn_egg": "毛毛蟲刷怪蛋", "item.antarchy.butterfly_spawn_egg": "蝴蝶刷怪蛋", "item.antarchy.brutalfly_spawn_egg": "布魯塔爾弗萊刷怪蛋", - "item.antarchy.cloud_shark_spawn_egg": "雲鯊刷怪蛋", + "item.antarchy.stratoshark_spawn_egg": "雲鯊刷怪蛋", "item.antarchy.kraken_spawn_egg": "呃，不。別這樣。", "item.antarchy.missile_squid_spawn_egg": "導彈魷魚刷怪蛋", "item.antarchy.octopus_bomb_spawn_egg": "章魚炸彈刷怪蛋", @@ -512,7 +512,7 @@ "message.antarchy.termite_activated": "白蟻已準備好開啟目的地。", "message.antarchy.termite_needs_reagent": "這隻白蟻需要試劑才能開啟目的地。", "death.attack.spit_bug_disrespect": "%1$s遭到了噴吐蟲的羞辱", - "death.attack.jumpy_bug_jump": "%1$s被跳跳蟲撲倒了", + "death.attack.springbug_jump": "%1$s被跳跳蟲撲倒了", "death.attack.hercules_beetle_obliteration": "%1$s被赫拉克勒斯甲蟲徹底摧毀", "message.antarchy.big_bertha.mode": "大貝莎模式：%s", "message.antarchy.big_bertha.mode.basilisk": "蛇怪", @@ -542,10 +542,10 @@ "effect.antarchy.growth": "生長", "effect.antarchy.bloodglass_ward": "血晶守護", "effect.antarchy.bloodglass_ward.description": "給予會破碎的心，能吸收完整一次傷害。它們會隨時間恢復。", - "death.attack.triffid_mauling": "%1$s被一株植物撕咬致死", - "death.attack.triffid_mauling.player": "%1$s被一株植物撕咬致死", - "death.attack.triffid_swallow": "%1$s被特里菲德吞下了", - "death.attack.triffid_swallow.player": "%1$s被特里菲德吞下了", + "death.attack.flytrap_mauling": "%1$s被一株植物撕咬致死", + "death.attack.flytrap_mauling.player": "%1$s被一株植物撕咬致死", + "death.attack.flytrap_swallow": "%1$s被特里菲德吞下了", + "death.attack.flytrap_swallow.player": "%1$s被特里菲德吞下了", "potion.antarchy.haste": "急迫藥水", "potion.antarchy.strong_haste": "強效急迫藥水", "tooltip.antarchy.big_bertha.mode": "模式：%s", @@ -662,11 +662,11 @@ "subtitles.antarchy.ant_bite": "螞蟻啃咬", "subtitles.antarchy.ant_gather": "螞蟻採集", "subtitles.antarchy.ant_nest": "蟻巢沙沙作響", - "subtitles.antarchy.cloud_shark_bite": "雲鯊啃咬", - "subtitles.antarchy.cloud_shark_idle": "雲鯊發出動靜", - "subtitles.antarchy.cloud_shark_hurt": "雲鯊受傷", - "subtitles.antarchy.cloud_shark_death": "雲鯊死亡", - "subtitles.antarchy.cloud_shark_fly": "雲鯊飛行", + "subtitles.antarchy.stratoshark_bite": "雲鯊啃咬", + "subtitles.antarchy.stratoshark_idle": "雲鯊發出動靜", + "subtitles.antarchy.stratoshark_hurt": "雲鯊受傷", + "subtitles.antarchy.stratoshark_death": "雲鯊死亡", + "subtitles.antarchy.stratoshark_fly": "雲鯊飛行", "subtitles.antarchy.caterpillar_idle": "毛毛蟲發出動靜", "subtitles.antarchy.caterpillar_hurt": "毛毛蟲受傷", "subtitles.antarchy.caterpillar_crawl": "毛毛蟲爬行", @@ -706,12 +706,12 @@ "subtitles.antarchy.nightmare_death": "夢魘死亡", "subtitles.antarchy.nightmare_bite": "夢魘啃咬", "subtitles.antarchy.nightmare_flap": "夢魘振翅", - "subtitles.antarchy.triffid_attack": "特里菲德攻擊", - "subtitles.antarchy.triffid_grab": "特里菲德抓取", - "subtitles.antarchy.triffid_hurt": "特里菲德受傷", - "subtitles.antarchy.triffid_death": "特里菲德死亡", - "subtitles.antarchy.triffid_hiss": "特里菲德嘶嘶作響", - "subtitles.antarchy.triffid_growl": "特里菲德咆哮", + "subtitles.antarchy.flytrap_attack": "特里菲德攻擊", + "subtitles.antarchy.flytrap_grab": "特里菲德抓取", + "subtitles.antarchy.flytrap_hurt": "特里菲德受傷", + "subtitles.antarchy.flytrap_death": "特里菲德死亡", + "subtitles.antarchy.flytrap_hiss": "特里菲德嘶嘶作響", + "subtitles.antarchy.flytrap_growl": "特里菲德咆哮", "subtitles.antarchy.gravity_gun_pickup": "重力槍拾取", "subtitles.antarchy.gravity_gun_drop": "重力槍放下", "subtitles.antarchy.gravity_gun_hold_loop": "重力槍嗡鳴", @@ -882,23 +882,23 @@ "block.antarchy.amber_lichen": "琥珀地衣", "block.antarchy.bile_vein": "膽汁礦脈", "block.antarchy.creepvine": "爬藤", - "block.antarchy.creeping_horror_egg": "爬行恐魔蛋", - "block.antarchy.lurking_terror_egg": "潛伏恐魔蛋", + "block.antarchy.crawling_blight_egg": "爬行恐魔蛋", + "block.antarchy.skulking_fright_egg": "潛伏恐魔蛋", "entity.antarchy.termite": "白蟻", - "entity.antarchy.jumpy_bug": "跳跳蟲", + "entity.antarchy.springbug": "跳跳蟲", "entity.antarchy.spit_bug": "噴吐蟲", "entity.antarchy.stink_bug": "臭屁蟲", "entity.antarchy.rolly_polly": "鼠婦", - "entity.antarchy.creeping_horror": "爬行恐魔", - "entity.antarchy.lurking_terror": "潛伏恐魔", + "entity.antarchy.crawling_blight": "爬行恐魔", + "entity.antarchy.skulking_fright": "潛伏恐魔", "entity.antarchy.hercules_beetle": "赫拉克勒斯甲蟲", - "item.antarchy.jumpy_bug_spawn_egg": "跳跳蟲刷怪蛋", + "item.antarchy.springbug_spawn_egg": "跳跳蟲刷怪蛋", "item.antarchy.spit_bug_spawn_egg": "噴吐蟲刷怪蛋", "item.antarchy.stink_bug_spawn_egg": "臭屁蟲刷怪蛋", "item.antarchy.termite_spawn_egg": "白蟻刷怪蛋", "item.antarchy.rolly_polly_spawn_egg": "鼠婦刷怪蛋", - "item.antarchy.creeping_horror_spawn_egg": "爬行恐魔刷怪蛋", - "item.antarchy.lurking_terror_spawn_egg": "潛伏恐魔刷怪蛋", + "item.antarchy.crawling_blight_spawn_egg": "爬行恐魔刷怪蛋", + "item.antarchy.skulking_fright_spawn_egg": "潛伏恐魔刷怪蛋", "item.antarchy.hercules_beetle_spawn_egg": "赫拉克勒斯甲蟲刷怪蛋", "item.antarchy.chitin": "甲殼素", "block.antarchy.polished_broodstone": "磨製布魯德斯通", @@ -925,14 +925,14 @@ "block.antarchy.glowcap_mushroom_block": "熒光菌蓋蘑菇塊", "block.antarchy.molting_vines": "蛻皮藤蔓", "item.antarchy.broodfruit": "育巢果", - "block.antarchy.jumpy_bug_egg": "跳跳蟲蛋", - "subtitles.antarchy.creeping_horror_growl": "爬行恐魔咆哮", - "subtitles.antarchy.creeping_horror_hurt": "爬行恐魔受傷", - "subtitles.antarchy.creeping_horror_bite": "爬行恐魔啃咬", - "subtitles.antarchy.lurking_terror_snarl": "潛伏恐魔低吼", - "subtitles.antarchy.lurking_terror_hurt": "潛伏恐魔受傷", - "subtitles.antarchy.lurking_terror_bite": "潛伏恐魔啃咬", - "subtitles.antarchy.lurking_terror_fly_loop": "潛伏恐魔飛行", + "block.antarchy.springbug_egg": "跳跳蟲蛋", + "subtitles.antarchy.crawling_blight_growl": "爬行恐魔咆哮", + "subtitles.antarchy.crawling_blight_hurt": "爬行恐魔受傷", + "subtitles.antarchy.crawling_blight_bite": "爬行恐魔啃咬", + "subtitles.antarchy.skulking_fright_snarl": "潛伏恐魔低吼", + "subtitles.antarchy.skulking_fright_hurt": "潛伏恐魔受傷", + "subtitles.antarchy.skulking_fright_bite": "潛伏恐魔啃咬", + "subtitles.antarchy.skulking_fright_fly_loop": "潛伏恐魔飛行", "subtitles.antarchy.stink_bug_fart": "臭屁蟲放屁", "subtitles.antarchy.stink_bug_idle": "臭屁蟲發出動靜", "subtitles.antarchy.rolly_polly_idle": "鼠婦發出動靜", @@ -949,10 +949,10 @@ "subtitles.antarchy.jerry_hurt": "傑瑞受傷", "subtitles.antarchy.jerry_death": "傑瑞死亡", "subtitles.antarchy.jerry_attack": "傑瑞攻擊", - "subtitles.antarchy.jumpy_bug_idle": "跳跳蟲發出動靜", + "subtitles.antarchy.springbug_idle": "跳跳蟲發出動靜", "subtitles.antarchy.spit_bug_idle": "噴吐蟲發出動靜", - "subtitles.antarchy.jumpy_bug_hurt": "跳跳蟲受傷", - "subtitles.antarchy.jumpy_bug_jump": "跳跳蟲跳躍", + "subtitles.antarchy.springbug_hurt": "跳跳蟲受傷", + "subtitles.antarchy.springbug_jump": "跳跳蟲跳躍", "subtitles.antarchy.spit_bug_hurt": "噴吐蟲受傷", "subtitles.antarchy.spit_bug_spit": "噴吐蟲噴吐", "subtitles.antarchy.brutalfly_spit": "布魯塔爾弗萊噴吐", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_1.json similarity index 55% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_1.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_1.json index f4187644..5300e011 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_1.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_turtle_egg", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_2.json similarity index 56% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_2.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_2.json index d2f9f14d..40f07140 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_2.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_two_turtle_eggs", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_3.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_3.json similarity index 57% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_3.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_3.json index ef956bbe..d92eaec9 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_3.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_three_turtle_eggs", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_4.json new file mode 100644 index 00000000..51b989ff --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/crawling_blight_egg_4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_turtle_eggs", + "textures": { + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg", + "particle": "antarchy:block/crawling_blight_egg/crawling_blight_egg" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_4.json deleted file mode 100644 index e5ba6281..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/creeping_horror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg", - "particle": "antarchy:block/creeping_horror_egg/creeping_horror_egg" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/triffid_goo_block.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/flytrap_goo_block.json similarity index 91% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/triffid_goo_block.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/flytrap_goo_block.json index 514540a6..cbe7b9fc 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/triffid_goo_block.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/flytrap_goo_block.json @@ -1,9 +1,9 @@ { "parent": "minecraft:block/block", "textures": { - "particle": "antarchy:block/triffid_goo_block", - "outer": "antarchy:block/triffid_goo_block", - "inner": "antarchy:block/triffid_goo_block" + "particle": "antarchy:block/flytrap_goo_block", + "outer": "antarchy:block/flytrap_goo_block", + "inner": "antarchy:block/flytrap_goo_block" }, "display": { "gui": { diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_4.json deleted file mode 100644 index 30d35294..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg", - "particle": "antarchy:block/lurking_terror_egg/lurking_terror_egg" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_1.json similarity index 52% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_1.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_1.json index a63af561..343736ae 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_1.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_turtle_egg", "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg" + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_2.json similarity index 54% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_2.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_2.json index 71eec9e4..df0c28df 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_2.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_two_turtle_eggs", "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg" + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_3.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_3.json similarity index 54% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_3.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_3.json index 7e5d23e4..f376f18a 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/lurking_terror_egg_3.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_three_turtle_eggs", "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg" + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_4.json new file mode 100644 index 00000000..d2e42d6d --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/skulking_fright_egg_4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_turtle_eggs", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg", + "particle": "antarchy:block/skulking_fright_egg/skulking_fright_egg" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_1.json similarity index 60% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_1.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_1.json index 20b6a8ae..8dc1380c 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_1.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_turtle_egg", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_slightly_cracked" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_2.json similarity index 61% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_2.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_2.json index cbfa51e2..71482300 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_2.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_two_turtle_eggs", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_slightly_cracked" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_3.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_3.json similarity index 61% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_3.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_3.json index 03be473f..641a5f43 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_3.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_three_turtle_eggs", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_slightly_cracked" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_4.json new file mode 100644 index 00000000..7367e40b --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_crawling_blight_egg_4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_turtle_eggs", + "textures": { + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_slightly_cracked", + "particle": "antarchy:block/crawling_blight_egg/crawling_blight_egg_slightly_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_4.json deleted file mode 100644 index a3863d21..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_creeping_horror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked", - "particle": "antarchy:block/creeping_horror_egg/creeping_horror_egg_slightly_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_1.json deleted file mode 100644 index 7c3dc843..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_2.json deleted file mode 100644 index 5e296fad..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_3.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_3.json deleted file mode 100644 index 7f1c780e..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_three_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_4.json deleted file mode 100644 index 884cc982..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_lurking_terror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked", - "particle": "antarchy:block/lurking_terror_egg/lurking_terror_egg_slightly_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_1.json new file mode 100644 index 00000000..12a38039 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_turtle_egg", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_slightly_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_2.json new file mode 100644 index 00000000..03427ec6 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_two_turtle_eggs", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_slightly_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_3.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_3.json new file mode 100644 index 00000000..3ef9a637 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_three_turtle_eggs", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_slightly_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_4.json new file mode 100644 index 00000000..91e89eee --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/slightly_cracked_skulking_fright_egg_4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_turtle_eggs", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_slightly_cracked", + "particle": "antarchy:block/skulking_fright_egg/skulking_fright_egg_slightly_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/spit_bug_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/spit_bug_egg.json index 92ae529b..366970d0 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/spit_bug_egg.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/spit_bug_egg.json @@ -66,7 +66,7 @@ }, "groups": [ { - "name": "jumpy_bug_egg", + "name": "springbug_egg", "origin": [0, 0.1, 0], "scope": 0, "color": 0, diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/jumpy_bug_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/springbug_egg.json similarity index 94% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/jumpy_bug_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/springbug_egg.json index 9e31e7c0..9fa8d7ab 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/jumpy_bug_egg.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/springbug_egg.json @@ -3,8 +3,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "antarchy:block/jumpy_bug_egg", - "particle": "antarchy:block/jumpy_bug_egg" + "0": "antarchy:block/springbug_egg", + "particle": "antarchy:block/springbug_egg" }, "elements": [ { @@ -66,7 +66,7 @@ }, "groups": [ { - "name": "jumpy_bug_egg", + "name": "springbug_egg", "origin": [0, 0.1, 0], "scope": 0, "color": 0, diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_active.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_active.json new file mode 100644 index 00000000..1d20d342 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_active.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undervault_inner_faces","render_type":"cutout","textures":{"bottom":"antarchy:block/undertrial_spawner/undertrial_spawner_bottom","side":"antarchy:block/undertrial_spawner/undertrial_spawner_side_active","top":"antarchy:block/undertrial_spawner/undertrial_spawner_top_active","front":"antarchy:block/undertrial_spawner/undertrial_spawner_side_active"}} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_ejecting_reward.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_ejecting_reward.json new file mode 100644 index 00000000..904435b6 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_ejecting_reward.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undervault_inner_faces","render_type":"cutout","textures":{"bottom":"antarchy:block/undertrial_spawner/undertrial_spawner_bottom","side":"antarchy:block/undertrial_spawner/undertrial_spawner_side_active","top":"antarchy:block/undertrial_spawner/undertrial_spawner_top_ejecting_reward","front":"antarchy:block/undertrial_spawner/undertrial_spawner_side_active"}} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_inactive.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_inactive.json new file mode 100644 index 00000000..461ba592 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undertrial_spawner_inactive.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undervault_inner_faces","render_type":"cutout","textures":{"bottom":"antarchy:block/undertrial_spawner/undertrial_spawner_bottom","side":"antarchy:block/undertrial_spawner/undertrial_spawner_side_inactive","top":"antarchy:block/undertrial_spawner/undertrial_spawner_top_inactive","front":"antarchy:block/undertrial_spawner/undertrial_spawner_side_inactive"}} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_ejecting.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_ejecting.json new file mode 100644 index 00000000..c8c5e4a8 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_ejecting.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undervault_inner_faces","render_type":"cutout","textures":{"bottom":"antarchy:block/undervault/undervault_bottom","side":"antarchy:block/undervault/undervault_side_on","top":"antarchy:block/undervault/undervault_top_ejecting","front":"antarchy:block/undervault/undervault_front_ejecting"}} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_inner_faces.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_inner_faces.json new file mode 100644 index 00000000..dadfc9e0 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_inner_faces.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "render_type": "cutout", + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#front", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [15.998, 0.002, 0.002], + "to": [0.002, 15.998, 15.998], + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#front"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#side"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#side"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#side"}, + "up": {"uv": [16, 0, 0, 16], "texture": "#top"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#bottom"} + } + } + ] +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_off.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_off.json new file mode 100644 index 00000000..d28393c6 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_off.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undervault_inner_faces","render_type":"cutout","textures":{"bottom":"antarchy:block/undervault/undervault_bottom","side":"antarchy:block/undervault/undervault_side_off","top":"antarchy:block/undervault/undervault_top","front":"antarchy:block/undervault/undervault_front_off"}} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_on.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_on.json new file mode 100644 index 00000000..16f1c6a4 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/undervault_on.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undervault_inner_faces","render_type":"cutout","textures":{"bottom":"antarchy:block/undervault/undervault_bottom","side":"antarchy:block/undervault/undervault_side_on","top":"antarchy:block/undervault/undervault_top","front":"antarchy:block/undervault/undervault_front_on"}} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_1.json similarity index 58% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_1.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_1.json index 4ccfd5ca..7a19163c 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_1.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_turtle_egg", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_very_cracked" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_2.json similarity index 60% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_2.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_2.json index 37334cc9..ce78c22d 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_2.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_two_turtle_eggs", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_very_cracked" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_3.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_3.json similarity index 60% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_3.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_3.json index 824df80f..393dc9ad 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_3.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_three_turtle_eggs", "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_very_cracked" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_4.json new file mode 100644 index 00000000..7495f66c --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_crawling_blight_egg_4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_turtle_eggs", + "textures": { + "all": "antarchy:block/crawling_blight_egg/crawling_blight_egg_very_cracked", + "particle": "antarchy:block/crawling_blight_egg/crawling_blight_egg_very_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_4.json deleted file mode 100644 index 71494d84..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_creeping_horror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked", - "particle": "antarchy:block/creeping_horror_egg/creeping_horror_egg_very_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_1.json deleted file mode 100644 index 248b4d18..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_turtle_egg", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_2.json deleted file mode 100644 index 0ac42d62..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_two_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_4.json deleted file mode 100644 index c4e1dca5..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_four_turtle_eggs", - "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked", - "particle": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_1.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_1.json new file mode 100644 index 00000000..fbe98dc1 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_turtle_egg", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_very_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_2.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_2.json new file mode 100644 index 00000000..170949d6 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_two_turtle_eggs", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_very_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_3.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_3.json similarity index 50% rename from common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_3.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_3.json index 40a9f01b..9064645a 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_lurking_terror_egg_3.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_three_turtle_eggs", "textures": { - "all": "antarchy:block/lurking_terror_egg/lurking_terror_egg_very_cracked" + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_very_cracked" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_4.json b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_4.json new file mode 100644 index 00000000..59b8677e --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/block/very_cracked_skulking_fright_egg_4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_four_turtle_eggs", + "textures": { + "all": "antarchy:block/skulking_fright_egg/skulking_fright_egg_very_cracked", + "particle": "antarchy:block/skulking_fright_egg/skulking_fright_egg_very_cracked" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/creeping_horror_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/crawling_blight_egg.json similarity index 56% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/creeping_horror_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/crawling_blight_egg.json index 09dddc04..ebb8caab 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/creeping_horror_egg.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/crawling_blight_egg.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "antarchy:item/creeping_horror_egg" + "layer0": "antarchy:item/crawling_blight_egg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_spawn_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/crawling_blight_spawn_egg.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_spawn_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/crawling_blight_spawn_egg.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_boots.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_goo.json similarity index 60% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_boots.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_goo.json index c7c80c03..5674520f 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_boots.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_goo.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "antarchy:item/jumpy_boots" + "layer0": "antarchy:item/flytrap_goo" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_goo_block.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_goo_block.json new file mode 100644 index 00000000..7cb5ec7e --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_goo_block.json @@ -0,0 +1,3 @@ +{ + "parent": "antarchy:block/flytrap_goo_block" +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/creeping_horror_spawn_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_spawn_egg.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/creeping_horror_spawn_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/flytrap_spawn_egg.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/lurking_terror_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/lurking_terror_egg.json deleted file mode 100644 index 42cebd01..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/lurking_terror_egg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "antarchy:item/lurking_terror_egg" - } -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/skulking_fright_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/skulking_fright_egg.json new file mode 100644 index 00000000..7becb37d --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/skulking_fright_egg.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "antarchy:item/skulking_fright_egg" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_spawn_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/skulking_fright_spawn_egg.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_spawn_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/skulking_fright_spawn_egg.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_egg.json similarity index 56% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_egg.json index 9d3bd18e..61960ce9 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_egg.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_egg.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "antarchy:item/jumpy_bug_egg_item" + "layer0": "antarchy:item/springbug_egg_item" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_leg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_leg.json similarity index 59% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_leg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_leg.json index df0ed22b..94f1a894 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/jumpy_bug_leg.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_leg.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "antarchy:item/jumpy_bug_leg" + "layer0": "antarchy:item/springbug_leg" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/lurking_terror_spawn_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_spawn_egg.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/lurking_terror_spawn_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/springbug_spawn_egg.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_goo.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/springy_boots.json similarity index 59% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_goo.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/springy_boots.json index fd896a63..451aa419 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_goo.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/springy_boots.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "antarchy:item/triffid_goo" + "layer0": "antarchy:item/springy_boots" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_fin.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_fin.json similarity index 58% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_fin.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_fin.json index 69ceebda..1497486a 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_fin.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_fin.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "antarchy:item/cloud_shark_fin" + "layer0": "antarchy:item/stratoshark_fin" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_fin_soup.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_fin_soup.json similarity index 55% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_fin_soup.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_fin_soup.json index bec6b015..66950e5f 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/cloud_shark_fin_soup.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_fin_soup.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "antarchy:item/cloud_shark_fin_soup" + "layer0": "antarchy:item/stratoshark_fin_soup" } } diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_spawn_egg.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_spawn_egg.json similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_spawn_egg.json rename to common-1.21.1/src/main/resources/assets/antarchy/models/item/stratoshark_spawn_egg.json diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_goo_block.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_goo_block.json deleted file mode 100644 index 2651ef66..00000000 --- a/common-1.21.1/src/main/resources/assets/antarchy/models/item/triffid_goo_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "antarchy:block/triffid_goo_block" -} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_key.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_key.json new file mode 100644 index 00000000..8107010b --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_key.json @@ -0,0 +1 @@ +{"parent":"minecraft:item/generated","textures":{"layer0":"antarchy:item/undertrial_key"}} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_spawner.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_spawner.json new file mode 100644 index 00000000..4567ce52 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/undertrial_spawner.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undertrial_spawner_inactive"} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/undervault.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/undervault.json new file mode 100644 index 00000000..363acc4d --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/undervault.json @@ -0,0 +1 @@ +{"parent":"antarchy:block/undervault_off"} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_omen.json b/common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_omen.json new file mode 100644 index 00000000..179ca66d --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_omen.json @@ -0,0 +1,3 @@ +{ + "textures": ["antarchy:undertrial/undertrial_omen"] +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_spawner_detection.json b/common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_spawner_detection.json new file mode 100644 index 00000000..3f1e11f6 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/particles/undertrial_spawner_detection.json @@ -0,0 +1,9 @@ +{ + "textures": [ + "antarchy:undertrial/undertrial_spawner_detection_0", + "antarchy:undertrial/undertrial_spawner_detection_1", + "antarchy:undertrial/undertrial_spawner_detection_2", + "antarchy:undertrial/undertrial_spawner_detection_3", + "antarchy:undertrial/undertrial_spawner_detection_4" + ] +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/particles/undervault_connection.json b/common-1.21.1/src/main/resources/assets/antarchy/particles/undervault_connection.json new file mode 100644 index 00000000..bd901a9d --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/particles/undervault_connection.json @@ -0,0 +1 @@ +{"textures":["antarchy:undertrial/undervault_connection"]} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds.json b/common-1.21.1/src/main/resources/assets/antarchy/sounds.json index 0c1d9f8d..3c36505a 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/sounds.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/sounds.json @@ -176,52 +176,52 @@ } ] }, - "cloud_shark_bite": { - "subtitle": "subtitles.antarchy.cloud_shark_bite", + "stratoshark_bite": { + "subtitle": "subtitles.antarchy.stratoshark_bite", "sounds": [ { - "name": "antarchy:mob/cloud_shark/cloud_shark_bite" + "name": "antarchy:mob/stratoshark/stratoshark_bite" } ] }, - "cloud_shark_idle": { - "subtitle": "subtitles.antarchy.cloud_shark_idle", + "stratoshark_idle": { + "subtitle": "subtitles.antarchy.stratoshark_idle", "sounds": [ { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle1" + "name": "antarchy:mob/stratoshark/stratoshark_idle1" }, { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle2" + "name": "antarchy:mob/stratoshark/stratoshark_idle2" }, { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle3" + "name": "antarchy:mob/stratoshark/stratoshark_idle3" }, { - "name": "antarchy:mob/cloud_shark/cloud_shark_idle4" + "name": "antarchy:mob/stratoshark/stratoshark_idle4" } ] }, - "cloud_shark_hurt": { - "subtitle": "subtitles.antarchy.cloud_shark_hurt", + "stratoshark_hurt": { + "subtitle": "subtitles.antarchy.stratoshark_hurt", "sounds": [ { - "name": "antarchy:mob/cloud_shark/cloud_shark_hurt" + "name": "antarchy:mob/stratoshark/stratoshark_hurt" } ] }, - "cloud_shark_death": { - "subtitle": "subtitles.antarchy.cloud_shark_death", + "stratoshark_death": { + "subtitle": "subtitles.antarchy.stratoshark_death", "sounds": [ { - "name": "antarchy:mob/cloud_shark/cloud_shark_death" + "name": "antarchy:mob/stratoshark/stratoshark_death" } ] }, - "cloud_shark_fly": { - "subtitle": "subtitles.antarchy.cloud_shark_fly", + "stratoshark_fly": { + "subtitle": "subtitles.antarchy.stratoshark_fly", "sounds": [ { - "name": "antarchy:mob/cloud_shark/cloud_shark_fly1" + "name": "antarchy:mob/stratoshark/stratoshark_fly1" } ] }, @@ -2316,137 +2316,137 @@ } ] }, - "triffid_attack": { - "subtitle": "subtitles.antarchy.triffid_attack", + "flytrap_attack": { + "subtitle": "subtitles.antarchy.flytrap_attack", "sounds": [ { - "name": "antarchy:mob/triffid/triffid_attack1" + "name": "antarchy:mob/flytrap/flytrap_attack1" } ] }, - "triffid_grab": { - "subtitle": "subtitles.antarchy.triffid_grab", + "flytrap_grab": { + "subtitle": "subtitles.antarchy.flytrap_grab", "sounds": [ { - "name": "antarchy:mob/triffid/triffid_grab1" + "name": "antarchy:mob/flytrap/flytrap_grab1" } ] }, - "triffid_hurt": { - "subtitle": "subtitles.antarchy.triffid_hurt", + "flytrap_hurt": { + "subtitle": "subtitles.antarchy.flytrap_hurt", "sounds": [ { - "name": "antarchy:mob/triffid/triffid_hurt1" + "name": "antarchy:mob/flytrap/flytrap_hurt1" }, { - "name": "antarchy:mob/triffid/triffid_hurt2" + "name": "antarchy:mob/flytrap/flytrap_hurt2" }, { - "name": "antarchy:mob/triffid/triffid_hurt3" + "name": "antarchy:mob/flytrap/flytrap_hurt3" } ] }, - "triffid_death": { - "subtitle": "subtitles.antarchy.triffid_death", + "flytrap_death": { + "subtitle": "subtitles.antarchy.flytrap_death", "sounds": [ { - "name": "antarchy:mob/triffid/triffid_hurt3" + "name": "antarchy:mob/flytrap/flytrap_hurt3" } ] }, - "triffid_hiss": { - "subtitle": "subtitles.antarchy.triffid_hiss", + "flytrap_hiss": { + "subtitle": "subtitles.antarchy.flytrap_hiss", "sounds": [ { - "name": "antarchy:mob/triffid/triffid_hiss1" + "name": "antarchy:mob/flytrap/flytrap_hiss1" } ] }, - "triffid_growl": { - "subtitle": "subtitles.antarchy.triffid_growl", + "flytrap_growl": { + "subtitle": "subtitles.antarchy.flytrap_growl", "sounds": [ { - "name": "antarchy:mob/triffid/triffid_growl1" + "name": "antarchy:mob/flytrap/flytrap_growl1" }, { - "name": "antarchy:mob/triffid/triffid_growl2" + "name": "antarchy:mob/flytrap/flytrap_growl2" } ] }, - "creeping_horror_bite": { - "subtitle": "subtitles.antarchy.creeping_horror_bite", + "crawling_blight_bite": { + "subtitle": "subtitles.antarchy.crawling_blight_bite", "sounds": [ { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite1" + "name": "antarchy:mob/crawling_blight/crawling_blight_bite1" }, { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite2" + "name": "antarchy:mob/crawling_blight/crawling_blight_bite2" }, { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite3" + "name": "antarchy:mob/crawling_blight/crawling_blight_bite3" }, { - "name": "antarchy:mob/creeping_horror/creeping_horror_bite4" + "name": "antarchy:mob/crawling_blight/crawling_blight_bite4" } ] }, - "creeping_horror_growl": { - "subtitle": "subtitles.antarchy.creeping_horror_growl", + "crawling_blight_growl": { + "subtitle": "subtitles.antarchy.crawling_blight_growl", "sounds": [ { - "name": "antarchy:mob/creeping_horror/creeping_horror_growl1" + "name": "antarchy:mob/crawling_blight/crawling_blight_growl1" }, { - "name": "antarchy:mob/creeping_horror/creeping_horror_growl2" + "name": "antarchy:mob/crawling_blight/crawling_blight_growl2" } ] }, - "creeping_horror_hurt": { - "subtitle": "subtitles.antarchy.creeping_horror_hurt", + "crawling_blight_hurt": { + "subtitle": "subtitles.antarchy.crawling_blight_hurt", "sounds": [ { - "name": "antarchy:mob/creeping_horror/creeping_horror_hurt1" + "name": "antarchy:mob/crawling_blight/crawling_blight_hurt1" }, { - "name": "antarchy:mob/creeping_horror/creeping_horror_hurt2" + "name": "antarchy:mob/crawling_blight/crawling_blight_hurt2" } ] }, - "lurking_terror_bite": { - "subtitle": "subtitles.antarchy.lurking_terror_bite", + "skulking_fright_bite": { + "subtitle": "subtitles.antarchy.skulking_fright_bite", "sounds": [ { - "name": "antarchy:mob/lurking_terror/lurking_terror_bite1" + "name": "antarchy:mob/skulking_fright/skulking_fright_bite1" } ] }, - "lurking_terror_fly_loop": { - "subtitle": "subtitles.antarchy.lurking_terror_fly_loop", + "skulking_fright_fly_loop": { + "subtitle": "subtitles.antarchy.skulking_fright_fly_loop", "sounds": [ { - "name": "antarchy:mob/lurking_terror/lurking_terror_fly_loop" + "name": "antarchy:mob/skulking_fright/skulking_fright_fly_loop" } ] }, - "lurking_terror_hurt": { - "subtitle": "subtitles.antarchy.lurking_terror_hurt", + "skulking_fright_hurt": { + "subtitle": "subtitles.antarchy.skulking_fright_hurt", "sounds": [ { - "name": "antarchy:mob/lurking_terror/lurking_terror_hurt1" + "name": "antarchy:mob/skulking_fright/skulking_fright_hurt1" }, { - "name": "antarchy:mob/lurking_terror/lurking_terror_hurt2" + "name": "antarchy:mob/skulking_fright/skulking_fright_hurt2" } ] }, - "lurking_terror_snarl": { - "subtitle": "subtitles.antarchy.lurking_terror_snarl", + "skulking_fright_snarl": { + "subtitle": "subtitles.antarchy.skulking_fright_snarl", "sounds": [ { - "name": "antarchy:mob/lurking_terror/lurking_terror_snarl1" + "name": "antarchy:mob/skulking_fright/skulking_fright_snarl1" }, { - "name": "antarchy:mob/lurking_terror/lurking_terror_snarl2" + "name": "antarchy:mob/skulking_fright/skulking_fright_snarl2" } ] }, @@ -2516,20 +2516,20 @@ } ] }, - "jumpy_bug_idle": { - "subtitle": "subtitles.antarchy.jumpy_bug_idle", + "springbug_idle": { + "subtitle": "subtitles.antarchy.springbug_idle", "sounds": [ { - "name": "antarchy:mob/jumpy_bug/idle1" + "name": "antarchy:mob/springbug/idle1" }, { - "name": "antarchy:mob/jumpy_bug/idle2" + "name": "antarchy:mob/springbug/idle2" }, { - "name": "antarchy:mob/jumpy_bug/idle3" + "name": "antarchy:mob/springbug/idle3" }, { - "name": "antarchy:mob/jumpy_bug/idle4" + "name": "antarchy:mob/springbug/idle4" } ] }, @@ -2544,28 +2544,28 @@ } ] }, - "jumpy_bug_hurt": { - "subtitle": "subtitles.antarchy.jumpy_bug_hurt", + "springbug_hurt": { + "subtitle": "subtitles.antarchy.springbug_hurt", "sounds": [ { - "name": "antarchy:mob/jumpy_bug/hurt1" + "name": "antarchy:mob/springbug/hurt1" }, { - "name": "antarchy:mob/jumpy_bug/hurt2" + "name": "antarchy:mob/springbug/hurt2" } ] }, - "jumpy_bug_jump": { - "subtitle": "subtitles.antarchy.jumpy_bug_jump", + "springbug_jump": { + "subtitle": "subtitles.antarchy.springbug_jump", "sounds": [ { - "name": "antarchy:mob/jumpy_bug/jump1" + "name": "antarchy:mob/springbug/jump1" }, { - "name": "antarchy:mob/jumpy_bug/jump2" + "name": "antarchy:mob/springbug/jump2" }, { - "name": "antarchy:mob/jumpy_bug/jump3" + "name": "antarchy:mob/springbug/jump3" } ] }, diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite3.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite3.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite3.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite3.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite4.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite4.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_bite4.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_bite4.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_growl1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_growl1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_growl2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_growl2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_growl2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_hurt1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_hurt1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_hurt2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/creeping_horror/creeping_horror_hurt2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/crawling_blight/crawling_blight_hurt2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_attack1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_attack1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_attack1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_attack1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_grab1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_grab1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_grab1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_grab1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_growl1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_growl1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_growl1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_growl1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_growl2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_growl2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_growl2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_growl2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hiss1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hiss1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hiss1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hiss1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hurt1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hurt1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hurt1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hurt1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hurt2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hurt2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hurt2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hurt2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hurt3.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hurt3.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/triffid/triffid_hurt3.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/flytrap/flytrap_hurt3.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_bite1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_bite1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_bite1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_bite1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_fly_loop.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_fly_loop.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_fly_loop.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_fly_loop.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/hurt1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_hurt1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/hurt1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_hurt1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/hurt2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_hurt2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/hurt2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_hurt2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_snarl1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_snarl1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_snarl2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_snarl2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/skulking_fright/skulking_fright_snarl2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/hurt1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/hurt1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/hurt2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/lurking_terror/lurking_terror_hurt2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/hurt2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle3.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle3.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle3.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle3.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle4.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle4.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/idle4.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/idle4.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/jump1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/jump1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/jump1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/jump1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/jump2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/jump2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/jump2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/jump2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/jump3.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/jump3.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/jumpy_bug/jump3.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/springbug/jump3.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_bite.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_bite.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_bite.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_bite.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_death.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_death.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_death.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_death.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_fly1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_fly1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_fly1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_fly1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_hurt.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_hurt.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_hurt.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_hurt.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle1.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle1.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle1.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle1.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle2.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle2.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle2.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle2.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle3.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle3.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle3.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle3.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle4.ogg b/common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle4.ogg similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/cloud_shark/cloud_shark_idle4.ogg rename to common-1.21.1/src/main/resources/assets/antarchy/sounds/mob/stratoshark/stratoshark_idle4.ogg diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/crawling_blight_egg/crawling_blight_egg.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/crawling_blight_egg/crawling_blight_egg.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_slightly_cracked.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/crawling_blight_egg/crawling_blight_egg_slightly_cracked.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_slightly_cracked.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/crawling_blight_egg/crawling_blight_egg_slightly_cracked.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_very_cracked.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/crawling_blight_egg/crawling_blight_egg_very_cracked.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/creeping_horror_egg/creeping_horror_egg_very_cracked.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/crawling_blight_egg/crawling_blight_egg_very_cracked.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/triffid_goo_block.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/flytrap_goo_block.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/triffid_goo_block.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/flytrap_goo_block.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/skulking_fright_egg/skulking_fright_egg.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/skulking_fright_egg/skulking_fright_egg.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_slightly_cracked.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/skulking_fright_egg/skulking_fright_egg_slightly_cracked.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_slightly_cracked.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/skulking_fright_egg/skulking_fright_egg_slightly_cracked.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_very_cracked.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/skulking_fright_egg/skulking_fright_egg_very_cracked.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/lurking_terror_egg/lurking_terror_egg_very_cracked.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/skulking_fright_egg/skulking_fright_egg_very_cracked.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/jumpy_bug_egg.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/springbug_egg.png similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/jumpy_bug_egg.png rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/springbug_egg.png diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/jumpy_bug_egg.png.mcmeta b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/springbug_egg.png.mcmeta similarity index 100% rename from common-1.21.1/src/main/resources/assets/antarchy/textures/block/jumpy_bug_egg.png.mcmeta rename to common-1.21.1/src/main/resources/assets/antarchy/textures/block/springbug_egg.png.mcmeta diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_bottom.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a237c7600af8522d06d222e28922e232f5a9764e GIT binary patch literal 422 zcmV;X0a^ZuP)VX%Osfv=+4W=h-S)Yhy1+v@=cAQZy)Nd-4qoEQdve$Gn|+ zGyBH9w8uxM-NE>QRdUZec5J zifj`AE@!37>x+g~k6H{s7D0bKJu!eCw$i4^Hh~&0X9W@D)nfoVY^6<+Z2~o1&MSx@ zZ>4xf!bIPuk11>a#rTxjVGGixm9hcPTKx(xi%*#ywjgaDad8%FsL`m2hWr5l0RR6#TRcVp000I_L_t&o0P9IpV)}g* Q`v3p{07*qoM6N<$g7E9WoB#j- literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_side_active.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_side_active.png new file mode 100644 index 0000000000000000000000000000000000000000..4d12b97892b958d7cd34b7f0bb006066b1bbdcf6 GIT binary patch literal 454 zcmV;%0XhDOP)AStxQma44np)0a9iLCQKM8M&w3Zfh%warj#)ga}oy1-sLos9E*&6_HWhF zm#}v|t!Mq8b^6|S$8u$%ycn4-mlxN{x!I*O@>v*}8?)@OH`b1xL;dqETwmRWr~8LA z@>v*}8|mtzmiE{i*GGrKe7#5G`gvyy^Rey&l#BW z^a3C+`svN-uRN;i=FMH|z;ORqN!Z5uW$Fn3Umg`=;o~*DJUxcm%~?S_rVGvTsHfU8 zI5Pa*1s*#+J_*h8Xt8fpAQe_r9+MG|$*kcqS$ct%s4AF4%=dc%U(Nh4FnQ_%;B<$O zieqZw79Nw4x?slWTb<@+&-0(>F`1irOlA#_$)a1dE~`4{eZp@UCQC1Hlc(l!d~zaW w;Z@}|M*0E(0RR8Y)+!YM000I_L_t&o04e#7<4sP*f&c&j07*qoM6N<$g7>1-n*aa+ literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_side_inactive.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undertrial_spawner/undertrial_spawner_side_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..2113de32994763fa2eb336cdc65628e346fa492e GIT binary patch literal 459 zcmV;+0W|)JP)xyj@%1Bv0{ zb?WF!ZhrOY`#JB=xx2pS7q@qg%9Z8ya%gb4?CTv!mCwS+Sk1D=+IW9=8!oQS!ujz@ zczn1|mCwS+Sf%Hu=d{M!xVE|!78hoU@bNpjJSeJa@9O-ZAygUv_WF|6OplL*XhvsS zPg&p47+jNF6O-XQCZo*Mw1Hjs_P2}8t&QU0<}UCUZxbFfHiyS#5wyDj2~{UGG&iv! z=Q#s&o^Al-NngD&{gg*tot>LcFVNl5UlKMtHW_l~f6Jpr%uY>&fB$R3;puKcJmwYt z%A+^+EVXsDpRd4U*XLK^uRNOU8#PFWHI>I?#A7mZcubaV;7N29%ps;1ZopSF{|ii> zUIDPXO-RQvy>JST$w*%?HTqV&Iob7ep2uWP<}sN$JSK}y@pM_$G4B(;%P?8Gfs`(U3}PXXLWqfl1sV$r8?Ef@^f7!BU&XgDhSJ1<1qKTbqKKXzG12qB zC386h3E$1^%>1*vx3?xbJBgaLgJ^f>FyZ*&e^4C&LNY zl55cG50a!7W9xhS@iDF?xwM0ZEx88i1YH?pL47PuvA{8sH#Yv-2q<&~UR)YtT9dYJ z1$5KybcJb0NF1@&;v4pY1Iz;Hnbju_)G6E-a}~|WWhN9Zh;n<^l&`z{rYQ-ZCUBv=td%hQa%8Yup3$B0Y`Ztbs2OQ6Qx@5UemNw5wv2 z`R&+;qo@N9d}r^y*8i`4E^DjS(Lt*a-)Ze`ryNrIhaGd)26W8v;8n%*n%w?A%FA<2 zQ+cRJsZbQgr|PSe%Xb=LfbPCj)*ig-cq$+#O~1_BQJJ0zi5-t=);88st1UGx)Vvu6V7Oj^1j&hCiu_{PRX7x->ABsdz7Vku8 zLKhh1^jhAYX|rkH0&b(3o6%jdZvjLYERQ9?x|_zw`~OG$sn?wxCKlZ$6DJ3FoWDT8 zjS;(xn7PUE8}$>=ZJ6IazZf(|tQW3ZuekmOR6`fDm;1gid033t;@(X0E+l{!P3|Qn z*@ML9mH_RJ7C0{|;|t2ERD~9W>s(&0E-oc^Q|N$$MBW@GJa|h3bO(V(@~R+eRNXIqBiQ3-~6B%T;EOioY9#CXDmIZy{^ z&|2dBTHAciSo>E>?*b3`yflLxm1ul{PB9I>zbewz(N0_lDg)uLcp+|zoB@qvY7JWa zetZ{JfxkN-Mv*RtZ+3vAXi`_hvJ3L~SkOfq8ju7UWivN&e00dvK+HIv;ok<-l*%Ou z_yh9x@yWCSj$|7Al*?{Xi?K7aa}tY>xH+$bh9j8<-UMBlV?li^O|ighByaJx5m4v~ zJUB1Jw8m@A4(O)c=?cwWA#uc7i*Ioj9AFjjuB<+BpibewSgY$>vXn{*7eqNbIhFH^ zbRAqI@_L!jptbsfA&Estg-;W>P?5oi^!IifqS0XiE*Uv$Am(V${sI61|NqZ~ZEOGl f00v1!K~w_(2s0LIlLHk`00000NkvXXu0mjf5P8*v literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_bottom.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..2aa6ba52461ac943ab9b3e22aa13d28b4f2537b5 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-uB!5SRt~O4rVcu~)^3jd zzCdvwPZ!6Kid)GH%)75#u;uyozx;3Fh4h3U2Njb4ySF+%`dTl{*7^N?qful~BmF>-fm1+t)ShF3pD&(^HEsKqKe(Qe&c* zSMvIrkaRL3k?R|Iix;G=vt5dRXyowVrG{FAF_lScF}(2gDUWyevYiggML42-_xn~? za(LK;8o0T-iHqZ8Js^VdhcfBy@6m4HXu$8K*3cS>XzVOtVNbFhkVmt5Ry1n$3c>P9 z;u2s0B?+HkYHO-BWXepN=_7C=vjA{3a(M6(Q>z_dIKMs)93Jfl_6~Lebd*RZ<@wD~ zz|qLz!OI3fHy}yiM@wU?7y7v;{uA8*PFu7`o5b9mLI6i2hX*flCYKk(U-1=4az9pJ zdGQsPk2ge&7HkOTWB|7s+=85TfY9ABpl^WomLv0*V93!B*~3yS1pBR0w(U_%xbvZa)=;15tNeB@)0 z#F)g)XvjyTSHF|{_BJ#1%ze)DJmIJm$dIL`S0^BFcD?W0+1>E1Z?5^6 zD4tBn<8xF2N5dmSmJNVzfJxy+VL_2wdbun96WsvLSd7P*)SR7007t_kLzepW{X-0Y zsYk%%e5}Co)FW^|?j;hmU_&@x25_svE%0;#gsRedeFKcgoiG_XfTQ67vgkTNW369$ zdpo4PwLuEFI6}!^7ZF@Hp5t5s%5q(V;vR literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_front_on.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_front_on.png new file mode 100644 index 0000000000000000000000000000000000000000..90eac17346d2e1a56db35222f6f05db8162e2de9 GIT binary patch literal 557 zcmV+|0@D47P)G}?twTvRMAg?3S~n=Z0;sVn^zZUujUxKnT`x)XGv zA}Ud1L?voOO^i|ezz<%1u1p9afs?uSoOADcXP9xl-9159G#dD|?Q3h$Sl<%-`x`a< z{LvWzIJ819H7>EXuEWEOa>p6PH#T*YzEMqGt%`qeXn62aL#@M@J_O^F4 zn2TvO7Pol#cFR^YJT#$(*sX7-l}erE0SVf6pXlSK4>k=k94Pcs>lh6okz5XW_%Dr5 zjB93k3R!SoXN9EJwh%6RMxIA;j!=q&cQ0R*vx-yZv^jkUy0Zcwqv62|PpwVBcq<#T zp^3@S(8$0SRL<9%GV&>dI;XVt|GRFZt>Dg&cpy zTOj8SM4BUtJb)OkcnjQ@{2|iOgDp|8w6G{Z4Ci&f);!!;n*gHW-Di6Pe!RN(4T^ke zG7#fI19-`8g676rb##1J`?n@lz78wa^2WgRQZ&7a?`ay$$k1&@QS z>HU-v^C!xt9`6U-tG5@bcU6Q2ywp(Z=Hk0bW-kqAcV+r@UZKvX(*KIE+B4;O!1X<^ v5+3iT_8tHL|Nk5vtzQ5D00v1!K~w_(!Wupvz+FvS00000NkvXXu0mjf_b>fA literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_side_off.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_side_off.png new file mode 100644 index 0000000000000000000000000000000000000000..10e264c695d247c6a05363368e21f694b8b53568 GIT binary patch literal 524 zcmV+n0`vWeP)*@5C9F5;s60ZQaB2f0#8 zIdG&D2O=3JiIFfvMkr$Vy!A}K5hqih-|u<9&-ZzH-gkbl>u7Du8Ff{WTvIIOG0onl z<1vl5J3Y<_bpJcap6c*0b05iT=msJ=JjA9uL=)Z?zY&H+a?3X&XP}Y8LoqevTyj6F z+4+QLV=Jwr^tCeQA)yCBBZtTQ))71h zSN!@_zW&?yzd1lC|MJVntclSoE9$*Q4Ad4(U?VdkquQDnZF*+hZ;N81pn-|(*J67= zrjaXXz_^TA`YEi2Xe<{5jXY2Y+4BoI9xQ;78FO!YS7Q^Sp&)4F0Wa(y94LQ?PmPH2 zA?EdeV{iga8#pkw5(JI$$y-A|!H@E=YO4R}-|w$_|L%nb O0000j8EM{%Vioe3ve;_-`no_n{NW_fLV1yat zBOm!__?^1PGh$`xH_v^p`?~M$bDrn8$?=Jt5$)~Ijm2Uf)9h(F9@BWbo2!gKAHVGF zjV>-SACbIwiP3txhrLD&)D}!&BQqkS+L{<`X?ekKi(;dofr;$bVtan4kt=AxxQtobP_L1p zSS|<}d7uz(?;qs&V*!lJm`Cx1<`-u}LD0wpUN}8ER{juw8WH1H%6|`GDY0>_Z0hs-D33g-&Q+53a0jU2PPp~G6D6~cp1ZeV_1%Xx{6`uM7pXH-k_T<- xU#0MvpW1f-00960sZwaZ00006Nkl;)sCn5j<002ovPDHLkV1oN>?ymp< literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_top.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/block/undervault/undervault_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c477f33035d4532ec11c178187fbef260c0b8035 GIT binary patch literal 555 zcmV+`0@VG9P)f0Z?db{+dl9D54OpY2HxZqJLGa%Sr&uMdQL#Mf8LngDL zc%)vp1&P?@;lM=$%;5a$T7}DFg+EmqYO9+BAVj~#Su9VTJX|zqdH?AI{#o8gyb#2H zBng$QN!aRMr8P7a5lh5H3~UW9)Twl2vAP&R~h>7h=Nf!A?+f z8au(>Va|Gl2vYTF@#TrhF)b`jE8X1_fEr*1nA#A%iik)ef=utg3w!blzIL|u4RiCe za;IPhfkFAlGR-Vb86Y`yH1}zAXxv29H+Po>xP_nvTxfxn;V=hcw-O_w2DnCYPGc>Q za9{?s!k*)@I=C7}8#;%bW;L1_y70~DFHcGD;4aRl?f?stp z)&BXdudzx)D%D^=RW`pWV)Fb@(L_XW(Eu~3PIvwYTT`cI8DF?pY5YgM!?h^euM t3ov*900960Yc8d%00006NklzA8S4h>q6vx)}LBvbDadyYuiXSsy0FBSKZaK6&Rp+SoWXu#R& zg&ZF2bC#yYHm$yLpLoI0IJ9`)UK76?IF&wWX$;6v?~H^Wj@5|43&P;gpv6;LS1%4J z-yaz{zde%O<4uXa#Js+IpUGyF+uq+$EgrlMDW*zi(%K@{CU>#kxZJ4VuN$zAcUmm| zFGL?A>v#j`F@fSRIAAx`06RdK!K!ygZ?KzcfE|pq>J71(RlBJMaOmn7l&R50@i(`d z=1+w~gBFq(paE>~7{8LklP&SL4#1TJ92&HE5b0~|?g`4!$S7xt#qYJ2x)_HR4;tNo zrlz_|ni`sgk0#jNCjo!30L=Kv(4fTwG@!G+Uckb9NIKsHZ`upbd!BR7bDsCScIi6vvn#E?&?Pfci-Ftam&LhVSzFpSK+Txw zA{K*_*rx6DVqNx*SC#ZTs6x-nV!--r0R9`s)ndT9vD}(v2{IQ=Q5?% z)u|yj40yrk@yd|HNnPL&Omt2Uj+P!U3`jP_K~Tf~F~7vGw-n$E(nOTKqlD|C4MN)Z*d7u*aC m|Nk?rIadcXjSXZPGed=!*v``jL%#q;7(8A5T-G@yGywq2nJrQP literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_0.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_0.png new file mode 100644 index 0000000000000000000000000000000000000000..2af95fbfa7dc7318108932394d91714de6d634a6 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqcAhSdAr*{M&NzxPC~z=e@Z{v4 zaO}XcNJj4!G41T~HhypT52v&Ee4o6RVf(ydj*3ebR~Wu`_2s=itT6jqBR2!X|Nki) hF4O=`Vgs4P%Ss literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_1.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ec02cf35799f8a34517900b49adebc186650a3c0 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFq&YmugAr*`*XEzEm2#7ET_#|+O z1>8FDPV9mH0%JzMnIiv}pMH8*)k2xUZQXR+h7hIqd9DC*e8EvCS<`-4_b~OnfWMbZ^yab%S4*?s6oYH`j0oa^$zVC&$jt!0`V+&y}TX ffab7)%wc9&znDw#1-EAnP=vwL)z4*}Q$iB}|Hmns literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_3.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/particle/undertrial/undertrial_spawner_detection_3.png new file mode 100644 index 0000000000000000000000000000000000000000..1c57c69d51a8a5036f41f9620a6786b4bd0050f1 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqCY~;iAr*{!&TJH92w-8p@P2(d zlkltqHFJzKU+f5;Q2sMtk|A@}8^(_Io`%Ew7A}gTe~DWM4fvkW6? literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/advancement/anger_the_hive_mind.json b/common-1.21.1/src/main/resources/data/antarchy/advancement/anger_the_hive_mind.json index b7bf748b..8f6700dd 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/advancement/anger_the_hive_mind.json +++ b/common-1.21.1/src/main/resources/data/antarchy/advancement/anger_the_hive_mind.json @@ -31,7 +31,7 @@ "frame": "task", "icon": { "count": 1, - "id": "antarchy:creeping_horror_spawn_egg" + "id": "antarchy:crawling_blight_spawn_egg" }, "show_toast": true, "title": { diff --git a/common-1.21.1/src/main/resources/data/antarchy/advancement/shark_weak.json b/common-1.21.1/src/main/resources/data/antarchy/advancement/shark_weak.json index 66b5ab4c..11c3275f 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/advancement/shark_weak.json +++ b/common-1.21.1/src/main/resources/data/antarchy/advancement/shark_weak.json @@ -1,10 +1,10 @@ { "parent": "antarchy:visit_elythia", "criteria": { - "kill_cloud_shark": { + "kill_stratoshark": { "conditions": { "entity": { - "type": "antarchy:cloud_shark" + "type": "antarchy:stratoshark" } }, "trigger": "minecraft:player_killed_entity" @@ -18,7 +18,7 @@ "frame": "task", "icon": { "count": 1, - "id": "antarchy:cloud_shark_fin" + "id": "antarchy:stratoshark_fin" }, "show_toast": true, "title": { @@ -27,7 +27,7 @@ }, "requirements": [ [ - "kill_cloud_shark" + "kill_stratoshark" ] ], "sends_telemetry_event": true diff --git a/common-1.21.1/src/main/resources/data/antarchy/advancement/soups_up.json b/common-1.21.1/src/main/resources/data/antarchy/advancement/soups_up.json index 1ca68d32..a4cd4c5d 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/advancement/soups_up.json +++ b/common-1.21.1/src/main/resources/data/antarchy/advancement/soups_up.json @@ -5,7 +5,7 @@ "conditions": { "item": { "items": [ - "antarchy:cloud_shark_fin_soup" + "antarchy:stratoshark_fin_soup" ] } }, @@ -20,7 +20,7 @@ "frame": "task", "icon": { "count": 1, - "id": "antarchy:cloud_shark_fin_soup" + "id": "antarchy:stratoshark_fin_soup" }, "show_toast": true, "title": { diff --git a/common-1.21.1/src/main/resources/data/antarchy/damage_type/triffid_mauling.json b/common-1.21.1/src/main/resources/data/antarchy/damage_type/flytrap_mauling.json similarity index 78% rename from common-1.21.1/src/main/resources/data/antarchy/damage_type/triffid_mauling.json rename to common-1.21.1/src/main/resources/data/antarchy/damage_type/flytrap_mauling.json index 6cf0af8f..cbd46d4f 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/damage_type/triffid_mauling.json +++ b/common-1.21.1/src/main/resources/data/antarchy/damage_type/flytrap_mauling.json @@ -1,5 +1,5 @@ { - "message_id": "triffid_mauling", + "message_id": "flytrap_mauling", "scaling": "when_caused_by_living_non_player", "exhaustion": 0.1, "effects": "hurt", diff --git a/common-1.21.1/src/main/resources/data/antarchy/damage_type/triffid_swallow.json b/common-1.21.1/src/main/resources/data/antarchy/damage_type/flytrap_swallow.json similarity index 78% rename from common-1.21.1/src/main/resources/data/antarchy/damage_type/triffid_swallow.json rename to common-1.21.1/src/main/resources/data/antarchy/damage_type/flytrap_swallow.json index e3e25b12..6569b464 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/damage_type/triffid_swallow.json +++ b/common-1.21.1/src/main/resources/data/antarchy/damage_type/flytrap_swallow.json @@ -1,5 +1,5 @@ { - "message_id": "triffid_swallow", + "message_id": "flytrap_swallow", "scaling": "when_caused_by_living_non_player", "exhaustion": 0.1, "effects": "hurt", diff --git a/common-1.21.1/src/main/resources/data/antarchy/damage_type/jumpy_bug_jump.json b/common-1.21.1/src/main/resources/data/antarchy/damage_type/springbug_jump.json similarity index 79% rename from common-1.21.1/src/main/resources/data/antarchy/damage_type/jumpy_bug_jump.json rename to common-1.21.1/src/main/resources/data/antarchy/damage_type/springbug_jump.json index e6c918fb..ebd3b2e0 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/damage_type/jumpy_bug_jump.json +++ b/common-1.21.1/src/main/resources/data/antarchy/damage_type/springbug_jump.json @@ -1,5 +1,5 @@ { - "message_id": "jumpy_bug_jump", + "message_id": "springbug_jump", "scaling": "when_caused_by_living_non_player", "exhaustion": 0.1, "effects": "hurt", diff --git a/common-1.21.1/src/main/resources/data/antarchy/enchantment/chronosphere.json b/common-1.21.1/src/main/resources/data/antarchy/enchantment/chronosphere.json new file mode 100644 index 00000000..61c8b34d --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/enchantment/chronosphere.json @@ -0,0 +1,22 @@ +{ + "anvil_cost": 8, + "description": { + "translate": "enchantment.antarchy.chronosphere" + }, + "effects": {}, + "max_cost": { + "base": 55, + "per_level_above_first": 15 + }, + "max_level": 3, + "min_cost": { + "base": 30, + "per_level_above_first": 15 + }, + "primary_items": "#minecraft:enchantable/chest_armor", + "slots": [ + "chest" + ], + "supported_items": "#minecraft:enchantable/chest_armor", + "weight": 1 +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/enchantment/feather_rising.json b/common-1.21.1/src/main/resources/data/antarchy/enchantment/feather_rising.json new file mode 100644 index 00000000..b81459c2 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/enchantment/feather_rising.json @@ -0,0 +1,22 @@ +{ + "anvil_cost": 4, + "description": { + "translate": "enchantment.antarchy.feather_rising" + }, + "effects": {}, + "max_cost": { + "base": 45, + "per_level_above_first": 0 + }, + "max_level": 1, + "min_cost": { + "base": 25, + "per_level_above_first": 0 + }, + "primary_items": "#minecraft:enchantable/foot_armor", + "slots": [ + "feet" + ], + "supported_items": "#minecraft:enchantable/foot_armor", + "weight": 2 +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/crawling_blight_egg.json similarity index 87% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/crawling_blight_egg.json index 1cfefbdd..800dd9b0 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/crawling_blight_egg.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "antarchy:lurking_terror_egg", + "name": "antarchy:crawling_blight_egg", "functions": [ { "function": "minecraft:explosion_decay" diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_eggs.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/crawling_blight_eggs.json similarity index 100% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_eggs.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/crawling_blight_eggs.json diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/triffid_goo_block.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/flytrap_goo_block.json similarity index 72% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/triffid_goo_block.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/flytrap_goo_block.json index b09e8e76..b1a37c0f 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/triffid_goo_block.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/flytrap_goo_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "antarchy:triffid_goo_block" + "name": "antarchy:flytrap_goo_block" } ], "conditions": [ @@ -16,5 +16,5 @@ ] } ], - "random_sequence": "antarchy:blocks/triffid_goo_block" + "random_sequence": "antarchy:blocks/flytrap_goo_block" } diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/skulking_fright_egg.json similarity index 87% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/skulking_fright_egg.json index 2a3ec5b3..a12a34cc 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/skulking_fright_egg.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "antarchy:creeping_horror_egg", + "name": "antarchy:skulking_fright_egg", "functions": [ { "function": "minecraft:explosion_decay" diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_eggs.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/skulking_fright_eggs.json similarity index 100% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_eggs.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/skulking_fright_eggs.json diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/jumpy_bug_egg.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/springbug_egg.json similarity index 73% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/jumpy_bug_egg.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/springbug_egg.json index 56e63d63..ec4d8398 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/jumpy_bug_egg.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/blocks/springbug_egg.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "antarchy:jumpy_bug_egg" + "name": "antarchy:springbug_egg" } ], "conditions": [ @@ -16,5 +16,5 @@ ] } ], - "random_sequence": "antarchy:blocks/jumpy_bug_egg" + "random_sequence": "antarchy:blocks/springbug_egg" } diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/underside_ruins/treasure.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/underside_ruins/treasure.json index 3562a324..130b62e3 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/underside_ruins/treasure.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/underside_ruins/treasure.json @@ -6,7 +6,7 @@ {"type":"minecraft:item","name":"antarchy:blood_crystal_shard","weight":12,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":2,"max":6}}]}, {"type":"minecraft:item","name":"antarchy:blood_crystal_apple","weight":16,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":1,"max":3}}]}, {"type":"minecraft:item","name":"minecraft:diamond_pickaxe","weight":8,"functions":[{"function":"minecraft:enchant_with_levels","levels":{"type":"minecraft:uniform","min":18,"max":30},"options":"#minecraft:on_random_loot"}]}, -{"type":"minecraft:item","name":"minecraft:book","weight":10,"functions":[{"function":"minecraft:enchant_randomly","options":["minecraft:mending","minecraft:unbreaking","minecraft:efficiency","minecraft:protection"]}]}, +{"type":"minecraft:item","name":"minecraft:book","weight":10,"functions":[{"function":"minecraft:enchant_randomly","options":["minecraft:mending","minecraft:unbreaking","minecraft:efficiency","minecraft:protection","antarchy:feather_rising","antarchy:chronosphere"]}]}, {"type":"minecraft:item","name":"minecraft:tipped_arrow","weight":7,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":4,"max":10}},{"function":"minecraft:set_potion","id":"antarchy:inversion"}]}, {"type":"minecraft:item","name":"minecraft:potion","weight":7,"functions":[{"function":"minecraft:set_potion","id":"antarchy:inversion"}]}, {"type":"minecraft:item","name":"antarchy:titanium_ingot","weight":1},{"type":"minecraft:item","name":"antarchy:uranium_ingot","weight":1} diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/crawling_blight.json similarity index 96% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/crawling_blight.json index fa23ca8f..563a90a5 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/lurking_terror.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/crawling_blight.json @@ -1,4 +1,4 @@ -{ +{ "type": "minecraft:entity", "pools": [ { @@ -68,5 +68,5 @@ ] } ], - "random_sequence": "antarchy:entities/lurking_terror" + "random_sequence": "antarchy:entities/crawling_blight" } diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/triffid.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/flytrap.json similarity index 89% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/triffid.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/flytrap.json index 703b4e66..2171a9cc 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/triffid.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/flytrap.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "antarchy:triffid_goo" + "name": "antarchy:flytrap_goo" } ], "conditions": [ @@ -35,5 +35,5 @@ ] } ], - "random_sequence": "antarchy:entities/triffid" + "random_sequence": "antarchy:entities/flytrap" } diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/skulking_fright.json similarity index 96% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/skulking_fright.json index a6a1b354..ec5d81ff 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/creeping_horror.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/skulking_fright.json @@ -1,4 +1,4 @@ -{ +{ "type": "minecraft:entity", "pools": [ { @@ -68,5 +68,5 @@ ] } ], - "random_sequence": "antarchy:entities/creeping_horror" + "random_sequence": "antarchy:entities/skulking_fright" } diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/springbug.json similarity index 97% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/springbug.json index 7bb37ad8..4b982ad4 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/jumpy_bug.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/springbug.json @@ -1,4 +1,4 @@ -{ +{ "type": "minecraft:entity", "pools": [ { @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "antarchy:jumpy_bug_leg", + "name": "antarchy:springbug_leg", "functions": [ { "function": "minecraft:set_count", diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/cloud_shark.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/stratoshark.json similarity index 85% rename from common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/cloud_shark.json rename to common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/stratoshark.json index 5a78e7af..0b515fcb 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/cloud_shark.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/entities/stratoshark.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "antarchy:cloud_shark_fin" + "name": "antarchy:stratoshark_fin" } ], "conditions": [ diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/spawners/underside_ruins/hard.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/spawners/underside_ruins/hard.json index 69807370..b6ea8bfb 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/spawners/underside_ruins/hard.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/spawners/underside_ruins/hard.json @@ -3,5 +3,5 @@ {"type":"minecraft:item","name":"antarchy:blood_crystal_katana","weight":4},{"type":"minecraft:item","name":"antarchy:blood_crystal_chestplate","weight":2},{"type":"minecraft:item","name":"antarchy:blood_crystal_leggings","weight":2},{"type":"minecraft:item","name":"antarchy:lucid_pearl","weight":4}, {"type":"minecraft:item","name":"antarchy:bluestone","weight":14,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":8,"max":20}}]},{"type":"minecraft:item","name":"antarchy:nyxite","weight":10,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":3,"max":8}}]}, {"type":"minecraft:item","name":"antarchy:blood_crystal_apple","weight":20,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":1,"max":3}}]}, -{"type":"minecraft:item","name":"minecraft:tipped_arrow","weight":8,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":4,"max":10}},{"function":"minecraft:set_potion","id":"antarchy:inversion"}]},{"type":"minecraft:item","name":"minecraft:potion","weight":8,"functions":[{"function":"minecraft:set_potion","id":"antarchy:inversion"}]},{"type":"minecraft:item","name":"minecraft:book","weight":10,"functions":[{"function":"minecraft:enchant_randomly","options":["minecraft:mending","minecraft:unbreaking","minecraft:efficiency","minecraft:fortune"]}]},{"type":"minecraft:item","name":"antarchy:titanium_ingot","weight":1},{"type":"minecraft:item","name":"antarchy:uranium_ingot","weight":1} +{"type":"minecraft:item","name":"minecraft:tipped_arrow","weight":8,"functions":[{"function":"minecraft:set_count","count":{"type":"minecraft:uniform","min":4,"max":10}},{"function":"minecraft:set_potion","id":"antarchy:inversion"}]},{"type":"minecraft:item","name":"minecraft:potion","weight":8,"functions":[{"function":"minecraft:set_potion","id":"antarchy:inversion"}]},{"type":"minecraft:item","name":"minecraft:book","weight":10,"functions":[{"function":"minecraft:enchant_randomly","options":["minecraft:mending","minecraft:unbreaking","minecraft:efficiency","minecraft:fortune","antarchy:feather_rising","antarchy:chronosphere"]}]},{"type":"minecraft:item","name":"antarchy:titanium_ingot","weight":1},{"type":"minecraft:item","name":"antarchy:uranium_ingot","weight":1} ]}],"random_sequence":"antarchy:spawners/underside_ruins/hard"} diff --git a/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_blade.json b/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_blade.json index a571bd07..9593727f 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_blade.json +++ b/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_blade.json @@ -20,7 +20,7 @@ "item": "antarchy:ultimate_sword" }, "E": { - "item": "antarchy:cloud_shark_fin" + "item": "antarchy:stratoshark_fin" }, "F": { "item": "antarchy:vortex_charge" diff --git a/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_hilt.json b/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_hilt.json index 244414ed..eb198b6e 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_hilt.json +++ b/common-1.21.1/src/main/resources/data/antarchy/recipe/big_bertha_hilt.json @@ -14,7 +14,7 @@ "item": "antarchy:molevore_nose" }, "C": { - "item": "antarchy:jumpy_bug_leg" + "item": "antarchy:springbug_leg" }, "D": { "item": "antarchy:jerry_nucleus" @@ -29,7 +29,7 @@ "item": "antarchy:hercules_horn" }, "H": { - "item": "antarchy:triffid_goo" + "item": "antarchy:flytrap_goo" } }, "result": { diff --git a/common-1.21.1/src/main/resources/data/antarchy/recipe/triffid_goo_block.json b/common-1.21.1/src/main/resources/data/antarchy/recipe/flytrap_goo_block.json similarity index 69% rename from common-1.21.1/src/main/resources/data/antarchy/recipe/triffid_goo_block.json rename to common-1.21.1/src/main/resources/data/antarchy/recipe/flytrap_goo_block.json index 77656042..fb572722 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/recipe/triffid_goo_block.json +++ b/common-1.21.1/src/main/resources/data/antarchy/recipe/flytrap_goo_block.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "antarchy:triffid_goo" + "item": "antarchy:flytrap_goo" } }, "pattern": [ @@ -12,6 +12,6 @@ "###" ], "result": { - "id": "antarchy:triffid_goo_block" + "id": "antarchy:flytrap_goo_block" } } diff --git a/common-1.21.1/src/main/resources/data/antarchy/recipe/miners_dream.json.disabled b/common-1.21.1/src/main/resources/data/antarchy/recipe/miners_dream.json.disabled index b35b1c80..ac875084 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/recipe/miners_dream.json.disabled +++ b/common-1.21.1/src/main/resources/data/antarchy/recipe/miners_dream.json.disabled @@ -7,7 +7,7 @@ "TTT" ], "key": { - "G": { "item": "antarchy:triffid_goo" }, + "G": { "item": "antarchy:flytrap_goo" }, "R": { "item": "minecraft:redstone_block" }, "D": { "item": "minecraft:diamond_pickaxe" }, "T": { "item": "minecraft:tnt" } diff --git a/common-1.21.1/src/main/resources/data/antarchy/recipe/jumpy_boots.json b/common-1.21.1/src/main/resources/data/antarchy/recipe/springy_boots.json similarity index 75% rename from common-1.21.1/src/main/resources/data/antarchy/recipe/jumpy_boots.json rename to common-1.21.1/src/main/resources/data/antarchy/recipe/springy_boots.json index ab820d6c..8c0f2e4f 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/recipe/jumpy_boots.json +++ b/common-1.21.1/src/main/resources/data/antarchy/recipe/springy_boots.json @@ -7,14 +7,14 @@ ], "key": { "J": { - "item": "antarchy:jumpy_bug_leg" + "item": "antarchy:springbug_leg" }, "B": { "item": "minecraft:netherite_boots" } }, "result": { - "id": "antarchy:jumpy_boots", + "id": "antarchy:springy_boots", "count": 1 } } diff --git a/common-1.21.1/src/main/resources/data/antarchy/recipe/cloud_shark_fin_soup.json b/common-1.21.1/src/main/resources/data/antarchy/recipe/stratoshark_fin_soup.json similarity index 68% rename from common-1.21.1/src/main/resources/data/antarchy/recipe/cloud_shark_fin_soup.json rename to common-1.21.1/src/main/resources/data/antarchy/recipe/stratoshark_fin_soup.json index a222940a..3b9fb7ac 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/recipe/cloud_shark_fin_soup.json +++ b/common-1.21.1/src/main/resources/data/antarchy/recipe/stratoshark_fin_soup.json @@ -3,14 +3,14 @@ "category": "food", "ingredients": [ { - "item": "antarchy:cloud_shark_fin" + "item": "antarchy:stratoshark_fin" }, { "item": "minecraft:bowl" } ], "result": { - "id": "antarchy:cloud_shark_fin_soup", + "id": "antarchy:stratoshark_fin_soup", "count": 1 } } diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins1.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins1.nbt new file mode 100644 index 0000000000000000000000000000000000000000..af7af5826d48a0f7942e25e7f7fc2f14e637020d GIT binary patch literal 1170 zcmb2|=3oGW|7T~N&AaR%(yIQ?|CGPD&O`yBM~b`BdLuTjUG{Rz#)3B|i~}{+pXE-N zEW`fzqwV1)hov2}YUWyhpUrJqxGN}YrBHO8@y4K4^*X!VFa6&cax?bon*BFI%fH%& ztt`DI`Bk{Hy!R;olUF}PSH{mcIwNw9+{^33A3*OqRA|4CjVnpzIux3+DRZ{J}1&svMgZ|gPT>k!Q$fn<7a+$8+S9PaV0!r zP~%Lv#Gtn1yG?^8OPb&Vfu1KoRA3nL2*@~dBJokWN_zqr1vWSvOah|A87q!Ro>Y{` zYWwrg4|q-=JEJHut#_ugfsV9sJ5c333!gujqG^1W z89=gWdJv25_qFj`92&F@wV!?pPOAJWU6h{N>-7^BZ(deUth5ZO$*rX~s8ay6xMSCIMnJ zB}z^@`=?U(+=iMHRqTg9DZZBFIbFA=+(760#(M`h#2l|;H-7aO7+yR3etI$kojtP` z=xihD&&+M9X4kCkq^E*(Nq}@E19iQzQ+X{re`8-&{lj#(|Lyy~80*~L@K=N}J@Cgj zsQCXP2&)ztgLC`{DZg6ScN) zyHu{d_16_M>&v??-FT;d_wuS3AmD%t4emy^DUE$AvzjSkw^S3EEC0`3>b-r<2fBM(Q9XspP zrSG2gPK;fB`greeZMHt&|N6lK;b#+X9C-O?{#E&YhyPcesx7#GHdXDxjZOIsdXMY( q?K}TJNOW0QYW#yQMO9xNt^eNKvMuM;yRWxb$r~Rx>YJ{?zyJV(-$2~} literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins2.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins2.nbt new file mode 100644 index 0000000000000000000000000000000000000000..b135357f521abaec079604875f3c92534f3ee9c9 GIT binary patch literal 1405 zcmZWn4N%f&9L7qk<>59R;zoIWSxu)9PE;gz`?svLq>n4ggutbueTWEU1le4eAL*Sq zMb9F(J2kyzrmh6PHWD*6J4J8GNXxH)k_-?P)V*kHyW9Vs`@iq~-skr`zxTP04|q?mDmD(ZB_YFsDJ{&*RHLsl*g)@rDP;kf zOam3uo?p*LyE>woFySgR115AtZ>({52xp)Vr9zkj07cxX437>8vO^-uP^h}e@K!Q> z1eQ+sv197tr&v1)!t}GZE0X{&HBySIQJK{!uaW(oOJu-bM(;me+7DgJy#)%N7P|qm zgBDQrD0__bAD~?lmxV>S-k9hhHvlYCG`l?hc%BQqZH(eF0r7KkeoV#;r}OOWx=fHo*XWl93PfbjoHCqSA& zfCL19@VRh!E9na%q>23PKOG?79(%qdOP(jjm3Un&ncPaGmvdwJ$M^zSp)KEm|7ht< z)d(hG`$gFg+a)a7wpM4h;WeSqQ6R%P0e5b!!Qg{dHDUs@ufPc!Jc~S2l%c2tdbfg3 zk+WnM#}jG3I!aQxWx)#`MuaqB?}d{iL^19Y*~YDc;sVz{>@l1KF%%b|bQV`HIKlGWhZ1M}S#PcBBmz2s zH?l@zUr~I!dE zjfTLRjo4%{C&0Rz2=VrEb9h|J>2eosiL$94fz(04W%P0v#trgLZl86Or@7cKBj5^q>Y=3W4+kk$59ng z1ZVS{$#z8BL#!wpoIm;|y+VDKy2}!A4uAH7K`y&2ds8{jBi336*VMqsgPJ zGvp!pYssLQt$jI>7M4CaYicu*Eootvvay2^I^EnBy?TO%-=%(V>vlbJb@LB-YN5VV z4^8KvuhgW438qOhn`F@6+Sb8;iXS+ZF1*QqRWZ)QKg8kCC2-f6VR!#uD<_)<4h1)q zDC@Iz0~+(NxN3se`+U7#{s3v)nb2~Vm}cPU{IZ&Q>v3)kl(o-Ui+he!???!2kdN literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins3.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins3.nbt new file mode 100644 index 0000000000000000000000000000000000000000..aac127ddb5192c8ae697321b9df28dd191b4cc90 GIT binary patch literal 2047 zcmaJ>3sjP471` zyy0kzax*XUmYJ6#QfMo0iD#qOo&)pX`9ckGSV<6ph_KG~(xxSV%I>@phoD zOZQpT=5a|?6_}4e4%QreZ^EVaU_@(PJd)$U?YeOkcAMUjl(=o9r_3)naUTNKM1YJF z^s!AA2DxCuE-5Zm2FyC&qK?w(5a4LM$Xt|oswK4$@gscgQYBr^@PnRLi%v%-=N(fA5dwOX?iY#m{AK?JVw-5nByXS*m zz8xfOO_SpcUeZ^F&xFNAwe7UB#) zj_3F__e*FmGu;PrDz^HslRz>!-_w>oCR(3mu^)G-`aqDD7sD@f95sR zDkvgwwz;ekHz5G17@_(wBNl*E2Ou%503^wN0BIsaX#2>zlQm?$<|)+9#YZB9`}9u; z-eV+PTAFIJDA1V>ANB@!>*K!S!-E4NwhAJPQbbv;l(qD$jkpaRYOipnC=H-+LJ2BI zXP;PglbTI~1ID&6MW=$~{vOS)Url5b{8@&&1?rn2P2vuR{~t~*EN)yNK(!J=WfKNy znSbRvAS@C#E<=$ZVI#1m2ge7>qf#=2J_ z^DHk%{6{Zltf?SgsUi6-`m-T}6+H|9TY7n|76d@f?5^JEYnWfJ#F zEael1)f9vcC>rWucXkcL8N>!8(t#CF(H)KNyjm=K`$FjU1KC1G9+(8j>u26bt*ggt zeg=3Aw{7OR6!uG(=rlu1ZfTgqf~Gfv;f=I_W)?IVX#y*GXppbhp)MK(`o2P(d*tig z)AomEvH%2#e2+o?MCa)KH-mt=J3-lnksLV*RpAwUgH&b1SA%iVd!2mIT)ZAA@L@Dy zDBGl{a0|M1R|Uvuw`1zB9)nS_mK)wG!FS;@!PVq%OK zH8H57im~zPdz~MW42kq|*eH5h!qklM zGKYUdTag(q2hC;}l9tMJe4njEGg>-UUn5a$avQK063pyEat717guN&+t9^3a2k2@t zE$oMKvu4d;JXfQ!RTYQkHjgSMugj0|&fXV1a6Pep*DGx3%nEeC5zmPbW$L*7Q}WKf z^xUe3`r+zov*Lo>;_?2-=|~4jXlw-iM1;C!y29D5UaaghA*wEg+qjD5F|MkcC=NsQ zxTEI0RRtYeKFjWD3(D^vG84@hVl{kPNocNw*b{9*l|*Guj=Z2?_Qp*)m9$*MVt&U} k*M_SintDp8_y)Ux@j$VmShMq#lKITA=NCVUz*|S>U$Q+GPyhe` literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins4.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins4.nbt new file mode 100644 index 0000000000000000000000000000000000000000..2af8c37d34a7c32fcd603009d4f055db0e752c4e GIT binary patch literal 4001 zcmb_ec~sL^78W`#2UP4RAR^jM6-7;mM#+F6GpA>yj6p{26oiDOQ4oOuvV=X-9%UR* zreum?k#q(I>w$`Fvcy1yfp``z!m z?-w>_tXQJ^)BfiQpXxhewalzNdS=^xfq%xjQ)$>l^S+zpn6EzgV7>6TLWPn|wCx*wY>?-D0%j`>B68&li4(p#&sI_g0lir1Qa!r}Kj7Nm7}uTG3i& zhQa=VZM-g`&ba&da5=mEq7^2QUKN% zpAc|xsjZ8kj2l_ivv0?(>#C}lHb2$3Px}>7LFew|nr~X}I+onuJX?KE8DcsjvJl+a z6#Q9yLEp7IRtHX=PnXA)?8FTklI!fGAUbVk#vH(nCI{S`FDSn#!nCKMDj1k~Q3j*&swiHL7cOO~F5Lnq>!4roHSW8QGh8Zz#o^|()xfr2; z;1**7?pfeMOqtb7iT$6GdW~(vA+ny(2uuAlq%UM;xCiPJUyB&d`xwr@bmrv)OmkFR zhxQ6P9c^Xv^WB2<7gY@i!|fJDS9z`1l#VT#ro3V<(UiwfhOqWzX&v#~aV^I99k}qc zQ4?MrmuSMP=6)(j@C(42@T!cJx46mcn77l;*wz~{2G(yZY|nkPjCkff-SVtEmAi!y zkZp}?U&S#+Po9D(*l7)x&9WsqprYfrS)}TyWtBx zql2_~+u%j)o~JC3ZmauI-_Gs>&J6sEHeO4FEXvVHec#MqAOprA1M%H5FwG6E1*He; zb$*kudPY1`gXGG0%YZd8M)q999x!Ib2F{Zi1JB<$vKTz6*} zZN2=|&Hb6Nd&M?wPI)P|++s;!Sy3)@(+L#ir+{MYUZCidS8qhIL4+;=q2ltb0k39N ze?({yy^;(A>+Ob`ej6er@k~dagY&>OASgTb$|?O_dXWZ$@CIz8|6;EHrzD4UsEt*v zNR*GGph$n`^!rXArS;#@WrJNencL%)6r1qvZzQHu1}^*a2HwQ}ok^qq3 zbC<(SDC!P}aMS!|Z*8SVU>Uuy1lQd(rd|!(ap~?8;H^JoPuhz)JIC~!36-juy}EFP z<|GV)wi4{7_rWOK44aM$q^%G2g%dRxn1=ow#cE180)jkorSLZpLj#L}Y3R>^MkGJP zrB_f9N-aY1Mb(SLL?MC4)`uQ-%RhV=4@*EiiWu98ZEO{*@%9B-`|JQ9@1OOzrwNBa zDTdP-N^)L>?Md{!2Q+qv;R8KYY%=0*D^Bt2wP{OaqzGEPBTyXzVw)dEV^*WEig>m{ zdIHWyptA%txcO*sJ%H+@Z8UmcQ8?`|w!b22!v%zL@F5_Sdsjf>H z7_OHB87>pw1v-mGoT62t>+PYJ5orhm!)bT0v2-{Ga=_F?R8H$8Mlr=|2G}V*fu?3b zyoJ7W0r1(NKlltZkk0^ahdj~)0Jv^idZ&L|tpf(5UnrAv0uT-%2e%>zv%_Fa+;5KF zx?z`DvjyhaCmZGs0|*r;vsf~6aRRNOt(+57(mMS&*ZUCic`Nccn}>dM;V_i($p!-! zlHZ&(czh6CgyVT72{W~83Mz8$!_Do^zNAr%;xlWCi|D4Rl@!c1bKMU*+FvC{`=7nB zGH@T(zwF;q`4=Ri3*rtU8YBqsw*Yf;kU58t!(01QHacY((g|J1I><#m8w6XB7R<>G z6Gfp*sK-redP(*WRBkF2X{;AxK}$UkxcXbbOrLC+6imCrm6yo8@J)B~YPRTb7n!k* z&6+7ZgWex{5S^d;b_D1pwYVdl*XZ4H2u~NJR7vXfVcOaSUTT23KYL+DO^d?{?wCzkFp^duO@co)t0@ThdEBUcJM&rWI^vv@ ziEWC_QWWf0uY@nSiDN>4H!ANEJu6Ae*)^BpM;;&MkFnXU;x3s5yY-fpy%#%Q!VbaT zs;3_CD~rqEcbQEz4(uxTpK|S${lqA@a82Qm!mu)RN|tn2EkC~3S^Fd?R*UNpx3Y)n zD%SD&XEXRBSF?O!BUz*3duab6d*)g(kj(bx_&97f%b!geE0+`0YpbV)^Xwi%=}=eD zPwMfG9(l)QvCEACUY_MdXGAw!eG*HpoiHDHe|+-|8wZK{PxC_;)JhR6Q=+yTa8+d7 zxyqRfte5cf#y7KvBqbFB6%Xti>3G`-f-Y$PT@RnjC*tO+}O_sgWY zEZ3qQx%{$MK25z(+Bl%O(Mw`A$WBRl<=y2IbLnKoT)k~BEwgVa)* zt7NRux%IJ;`rDW#ckNRVSBV6O}ug$ujr5?UcZ{X)^ z=;B)ST@Ut?38^-qK7Rg>wdAHgb>vLvY0d+;uMauWzqu@zP}M$ul$39p(^7t}6SPEZ z%Q~O@w1PgDT}vqS3f}nGmDc1>nrzZUW~;>~8y?Z_sLGqMQ%y}8hUY^|@vt_`8e246 Ix@5`!01w>Ef&c&j literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins5.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins5.nbt new file mode 100644 index 0000000000000000000000000000000000000000..e5567a22358d29e414215f2cd6e571f4ab2e3b68 GIT binary patch literal 10026 zcmcgy3s{rqz3*x*eaflS^%QVo=yaXuJXTUpHY5g;wmU+54wJ*PwN&Mz(34mTgo}hr z0vzfPD->$oCdeh*(kXrHpk5#b0ud223nooLxuhWmECE6S7?O~Lkn?}PB#^`)Tjw*M z@A*jH|M&i{zyBrgXJFYgPhkJ7-7-m9d`@BF+_saSy?OG}H&0$Vzh~VQL*9qqwzNmR z`eyOSkFMOlSaRy+-+iXYV1HTp_E!)7^v2wT!MOc>+SC8@q_oFetBtQQe=^(?8Ci2% zK{c3k)(#ebD22Re>QXl;xq^CJnqE+#)wEF(15-o9g+OfU;9ceME!(-)n`4HVMzbGz zF@Jt;=2PO2s$?Z&(?J0=x+0Y6EgVV=6)j!QsDC9udFy({2H%RTFVkzgO2z_$0+fdp zp^@IgJQGQKxVRdpn!KL8#VShit(r6j;KSH7?@C>Y;$r>Iu)EsSO5I`mQ{C5-+uzOo z!cU4*5yszBga(tmdpn;bwCk%T14!|?qVv*vtzQKpT-jHmWVO!LihV_0m*HcJnpjj^ zU9as)RSx=9O%erhxgxwDd@t(Gs%MZBbK`^iR44N;U5jekLCr^B@|$N{lg1^S_4Zc-lzm!|6t1GfD zrPrP=8LPzyC|S~smRd@ix3Uru2hK{2oUvMP2}=>G^cEUt#Rgyf#w`A%Ih!yXDJ1R- z6&bH*i2N$FhuD^q0{z^(Ufx1tLa1oYCJz{EZH&8)NBf4bE`9mOiY$J5?HDWqSMUmO zC4%QQGfjz`aj&E_j0J!exr)&3ux{th-9qbOey30hjZbn6zuKZas0bC>q_|i$l-Y>u zj4c<@R)6AwIXjv{5rJ2kx~lf|)S_aZK`Y{@d*`*8yM&#G==pMcIgQ5|<9Dk$lve!-^jEcjMf z^a|SNw0^qG_IQM03)!ZJS5%h^6ZT#JIt{%#5q|FvUCwz}STD zPxmO@p;TCW`bG}3c{LS3|88r90d9`R?Y4m;lkFsG=3GkWo^s7tj|cOSuHD-8?n*Da z2cwrc(}#&v=PN&vyl>EX=~e15cI8t(t_}%{A4FdwWEJ|4s#h-Jfx+z&AAbT19eYvi z;OgJ@epl7|U1z*E-)z|T&GF#Af%kjoNB(s=B>nqt?J3{AgLfi^_Ogq%oDc})IYX0w z^Pyp4gzOBXqT1<-xp1y7`COe~zl)B}`od?UszhkYS6u8!$o;~{O1cTs;nL<^`TSQu zBh+mU?&EDFv^Q2wW_L#^BYN-epbpcNIn?}UQ2%LQ?(qu5PX}D~nQFkovMnl#o5H990#AD>cGXLxinHxEx*MpM!iGKyd zz3j-*`#FH?x)DKp^ww(oCIm6R^TZOsODA!xqF5&}%US`LIM#RednB3aLn5s0Je$_8 zx}s#upCKmzU|rP5`1Ub#K+mDo^o$Cs$9wb(W?r|;wl}~n`=7D7Wk$B$8}xKqYWVz< zGXI~ym_Jh?QP#qfXPO60tW=^TTBj}bFJ>9uq^_(l*9(@(6pZZ)>tOzbfRu476$}UL+Hxx2 zd$`JAki|A7&1g>b+MMaaW)S>^Ntl+0e_HL%9;#-vuifj>8r&^=8FvcV>9S)EBRgf= zs$J@nP1ofT8_M@=Lxn>^WSw)`O2>Du>KdanRSPWinsQk1n za&y~>n825z%yJ;J3w~=`_1DE@Uc7v<4E=?D{{`6?3Ejo?Z;*}fFq?nYX;1$;zvvdi zk<2TH%3FV$>d$F>3p&&X(4h<=VS}QEKTD1WPn`l{{!f6217Z}=i_z){Slzu9Rx93w zrETA!nW{X-%7JEQJ>2E5qd;S{REC7TJBS)2khqAX22wW3CnSt74oH*E9wc!_B49fg zaZE*WHmBxZN$ujO%Xe=A-g^=8G$Ou-OIa8q>W?bI%46F8RFKr)c$n?qydz)yakZY9 zkgET5X~hR^u!KvZOUT%JLSXc)Gu)KubFRr zD^(5^j2~5G*9Gw#`$`6~TW4GM`XvlZURUitkQ-0)Zc?QHaVNj=G7wwT+2L~0L_$l# zKu^hlE>n@+9+w-Bhv$vd9-T6s1S3#>yi%Gl;D`HfgO`q#kjf;NN~5#Vo?G2~B9OH+I+TweDLC)Mmwppj*kB5O2q=iW#&Qd>U7qN}J#04U>)G zXU$pVn)i<={bhaqqF_^bi5E%mttd*#DkmqyoN$!>Yq#6Xdgv?u1vfv0Mu)rLb{p}= zreEL^w1G=#jokruFW>r@ulLR;JkJqF!_?BszEGEZloCr4P82pWDkPS;cE1~#Sjy`I zY=4>G??G*++g;cUCbQX?dGHseoK~-$_M2((DYQK(NyA&1-k-z2-95yJFtj1tay|gt zX6|N_sjVX6M3xWWIg`W@ha(;6ji7@(4s^)!Ia*g)EmHayXo?%P!KQE5!IU4K@3<*( z6T1VUx=64Oup2z9djfondo3twp63Ou(Y&ZyycOa{lWr0|4AqoH9z(XK0-jo#{NOYLRNoVigdz=sIO1G zG0&j{k!PT#F>@bQh=}RJI1ALbK9V7(8g85?n1sO z0;^1c;LxQ=(o8Df{zY8!H8Id`kGmEqH*A(VQKCZ_kTGb!(@}ilYUwmr?M+`ijqKoL zk-;4hTPp`*YeoL13>#-P)*2TZo!u2WJlKt90FSPeu-Wc52q(l5lH+1qQC|^4#N;A` zIz`G!f0UG~Q!Kpgn9(E%wgjMnoVFD8LTYa7mxq?Uw?gYZN`43xc3G$eIem-~3p2McVI<1Gwf+eP{5_|FDN2t^^NvP28Sjuw~8iE9~NBibIb zX!SiF!jG1!CTlBKZFC-LHP(@^i2(+HBTQ&I!#D_03-Xm(a=a9E1vO-^D+zUlVH|V? zDYgq#Per9ceF`h?Yf(^L(?f`w!=d)1+UuILSerPk#Q{rr4mx8C0)rkPgt(&?w-yEC z4Re6hCeBvZoW$BmsIEDbca?aQL<1DMHZo){4VQ?7B~X9Pbi0 z3}egKO3l3r{mqjU7s8wR0Dv!Ft_XD7xT)#9}%?p6ByKLgUN=Et0!#NQx) zmSQ-29>dvnh*|wFu%ps{AmLXEjw=MRNe~8E1>__bwFEeCYe)H`hEC*4LM=g70jVGb zNN1CPUm9vYYU~}rniMqZqTlhYTOeK2A~)lLVD?Bu{Z#5iVqKks3CF<~9)_@U0T5FR z>`msH6gQ=xW1|V@At|;A2UvR08jTifQC56~`DpeipxM<|$bA@^9m=~(LTFx#vf?Yu zN5`Ac4{LjfoI-;V(*>>MHEO6{w zvDvNxBuQWP604@{vKmyv5*h=k?X1#afNPqdlSY`2A7R16g$16rO|{azXHj0(Ln&;n zJC6bP-%%w(%YQpsd*{uI!F}z2shTWI!&n1;?i7sAh4^_%tA*aZnrr-b2aV`|yO{F! zjYM;|C@+*!4upq_Bn)c4sL7YHbVQ*VRTZu07;*~KHzq9c@Ztat*Q+}iN%QrY1%Qz;e)u4xB{-3C)O7D+$F+&Lf_tMr zQo%?Lo&B|xPOk_lwT@Z3@pP-S`*yd4YJH%-t*S}%2_ZEJ$tyRw-EOs$mP- zEGlU!*&-|xEcSiZeTOSpGWgt6^{8$yiN=R09fjt(m(I|G3T2CIpCaWbp1mX*v+^(J z8O3L;D&;`z8M$>%PmfEmXuG9>LA$n-YB=&QttO3JtEwG(Ky>Ud*9Ms(^FH^<0I!R zl^(mTp~Np9E#4CcHeZ(7I>dCuhQ(Lr+Mw=9U$*?vqAmDC$gek-)6onNeD3 z9@oJl&9;Q?Hr%Pb7|k)smY-% zrW-BPnP_fb;s|bBShlNZc)G}}86THLd(~Jd@hpQ$?NcM`DO1%PlU|+?mKnIw7Ss6D zsLqEnlA^&aPzn{r@;H`xs7o`ln9n>R+%+>oFL>6f|HVl7>%=JC_*5b3IqUDACdZ|b! zx$)ayT^=+V3o7R%8jVz1WVvVXGFkA2MMIW5k=_E!o%822myEHU0_Ah}nldEt%3H0@ z`LR4sW<6_a!?%B6ZA%bOo;OU(1!kUwI)3jGokuPlGtGB#Q>@wtQzl&-mrHpkfxd*_ NIkhFQdin=X{6BEyy6XS{ literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins6.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins6.nbt new file mode 100644 index 0000000000000000000000000000000000000000..88af2955965a30e67c9d223c111fc5e7fce627c3 GIT binary patch literal 3577 zcmZuy2{_b!*RHoGdPMeYJ&h%Mw#HI~B$60;5)WCjlYJP&V7xWQ3?mUTOvuRCzW;dZ{l4pZzPZlzpEJMTIrq8mbI$)7Q2dz_$DgCMobZGT&H{LH zE~q7BnuchYup(NW<>KZNH@y2a0<=>(k(EKCu(Dx|!LF5#{Mj3R zo|YHH?BE#|reYB3ksCH6)~yJf4(v_46)u0a_6CRxH2^<5`jmfENGhqE6F(l~=z)`d zd~EKc@%&>RI!}hNoe7W&3*3}N*t4J$Ax&DE{0rRoF5DMOD(1u!83}bN^E}6vq5KuX zy2<5Ec4P{Uwe~^J7%ee_PqTFoJpz~$A9=FrOYWpG-8WY}&BhjM>TZx=*m?7BE*CRF zt|DRze`XY}O!<<2aX~?Wh>{E=z|Be4UcdO~4i!I^&8dnI_@(0~Z}j7$@f7}r zI{zJ+5JiIH()t71qZItWOeLj5IN9ceAhFduGwO7d$|a^?N={T(j?P7)MQ67Kh7mR~ z3kfm`x>*+N-Q$l^sCx92B$+UED@Xleb|smx7}FKq1VfNRN~s=wXzvPeAT32ZJ~5+n zp!Q{m(fkV*sak&sSe=Vpi;x5vxPuu?QXgi^QB(n3fC@<~ znpehxO^Gr0$76I^H?@~x07Ce^WKPsRJMlT-rbHzSADrzMK1vUGc_7Go7w4G zaRl(l?Cx%T%C89m0VeD~!lso0(29whO(RQxnr#6v3g;Fftj&DUfbw9u42>|R64@OU zXvr$cQr5M3(@N5HC`_(l38UZIi_zS9lv1OsBF?m{Zg$@Ra0R(gp}D^^#Hn+;8L)1` zB!&Q4t48@EN`#5$H#+~-DR>@zs}l)O`-A`<$++YKEQ?^U0AR;x6E|UuvS#pOO7MAm zKy*gP5{wm0xLrV!O9W;>%@Yl~9JO7?KMr)cC`Ah=42o240M-x)eU<#7R!g-L7-J|; zZ?0Bnd2cQdb8npy168<^1B~nTBJ|l0settir{K&5BMV!unn-%nt5gfiq7vssY>bZW z*)bre@!m`<;JW|i@|SM+ay=hf$5wVnVB#XsuJa5@jnKS@>m9;1&L`Pcz(gCtb3i-U z<({?RZWn0sDbqX&G!jZji)CyyWpV7-$@pI$z(z?iHtLrkEf&TYOc`THzIjZYI5f^E z0*L#mg|U*qWc;7>6%9d~rn{j$>Tp90b|4LG6YP}&Jnmr6e+_0d@VJ+wLO9`?NCb)@ z%7+7mJx@$gq9;hWq)cF*L;+XMr`Q0geN4dYuvu)%uc+cM_qV14!Zn$FVfTQqNQN5h z9ftS#F=6v7pgQugA<&2>l3Jet0J@$#q1X=`9xqJ5J8nkrXNZKp|JXR8@7UrQuLLlN zBNVihx(ZvgO$8H<@_~6CG6VazsVxPk&)Qk6Qvm_>@cJB`m%pu*z8;QtoB0bAaK+ou!G{arjta$*N$m&9uRZ|_*bp~8#uS-?hVbK(%MqZi z>3|pZM0p+&HaCHOh}tI{IY92iRpX0#SkdwHVFJPAOkf`AS)R^w!)(gg9D`X1>Hvum5_1xn48q?3OpK(jQV^ zUSFuBA(qDG^0{j%ND6Y&1o%7jmDGy4g@%TNA*3E$52Nr@qy+NaNuk^>Zog65xQg^j znt(*AmS6DlntI&O=q@`pE`g*31R7x4Mn;8MIL+9g6;=UynI~Z@E7wdOi0)HIzE$z> z%;?U^Wush1^7joFYHwW*or&3J1syT!^+yn*SC^BsOrr_ zs(QM-*Es#+5WMEz8(AP+pv@~RlIqEkcp2Bicd9_8^CN8u*EsaeEVPwFHju!_$L{dy z*7M<-cW)IA_S$`gpC-gQBtbN6bEA7Aan9QO`wK+7Pa~f%W!W=ndSd*uVxgCOu|tUy zLfLF-u#rU>2+wJ6FIB_4uDs75_}|nDu(wM4Ze{jd@|olmVd)8DFK&ghd8muQ~R zx>)fSYRE-SZ4Wf;`|`WGpc%Lw_VdC4t)s>J0;!kz@7cQQc2&rk%$a-E{NvYbT;sMd zSLDA82KkGev#*7cXe-jP-}yPWR$?Bui8RGEOiuCt!7VbMWIQ5gyNGXD4xKXCzrH!g zv^T6^2S>s^7UVO%%t_e+bKhb=5AuF&HpORic>Iw&sbHHGIfa_Eyo?}~o8Vg|c_tUe zn}%Hf^t7`!iX&CBnVu`Kg0>6Y-VYdKnHH_~Sn6!{Pl$fjkRzRZ+gtNVS8rils=x6I zbHumdVrGy#d)h#6Uj;AKr$^t)8y%%;S$s{lS^BCH_0RBeXKld zmtj}fEV9nL+4Cp@eF*V)hfDZ->^hYSO@ATw%Xfp_APbW20M~-$-ArI8q)V?c&hDiy5>vv z%JkL{3<$fMo9&%VF`^yd6>7W%LbfDBXqoup^wzcE`W__hlm@)+O_i&KF)g)7n@;)a zWaplK;2*!F6$tyB1HgkW>>mWJz8u~OU)isMldaVEshQU&eQa_myFJL+bQAfwSV;Q8 z6jcK6bLceqE&&^W@%hoamDlFBF*(-b&D!=oy2V^_&oG;!ZS6U;y`(`OB=j6^WP`{s zkWkzA@oXgBq2b4O6Z1`{qxWB(22E&GpSG*m>Z4H;8pSc{u4IUI+uU}vf@Z2QtwXXp z%&RYQ@a2>AFsG&ctg)VVM2WrD5JMq(e#DoA914}b)|Y*_+nDN;yT84dt$_G}5t9wZ z)F1+ToY)8R_Ga!X1W4@3;-j%9ny|0y-5)Djlu#4Y*{zSbd7#lg;Z{nMiEKxfxfEGX zjGf$!8|CMYyBw-b7g5 jZWsAzu*Vyt;s+Nzb|_Thj(p zEu}J-Qq?l|TSFBMT0)zaxK2e~B5Wd2BAn-=+u8Z;_`ULd-}}Aq^ZuXb`9J^X)90*T zwfwgRq%casRDH=f;osq_{fS?D@%VD+9w` zFtCrO4mi3@6;CPRUT!cyW0+vbuTu5Ts_rSr4_((hsLl4m&5>@f-?tzLq&!WFS}rln z>J~4i^z-%UZzy^#!*@Nx2DdhwjM%EziRVZB)Wz%T?HEra8rgQHjk^+XNyc^8xC$8G za3{nvp{TMUtF3e>DSaX|^;vLgOT4X}N#`Bmm9hXz_Bm62h)=L^j-gzgeIzv?!rpiM z9VbgJGOV~xCj`x})ESJs57ia2I>SBDz(qEC93^uZ>neCw=y}___K1Ly$WgQ?4x;L7ACNI%S^v0KZr!}^h66HG$_X8^7xO_i!REMQ9BY485K^yaoZY-etQwT#bkDIK+ zXUt)+a9fD#_T~8jj(Db8rf)MXglLXh0TMf zmJJyhzDQ5{hJ8B|G2fW=`j_6cvlaSgxi~=Z-@W(V?tO8(^zWbo{s86r?cYH??m)}~ zXp0_mv%i`I`@dzUgtEPw3NvSyP^OZu4psPCZQ8^r|Iiu~PPyI+jk7}kbMhz(XAx$^ zLZ?7VxL;!~V+Gk7#Sbx;$HKb0>HCuA&%$>aIv}d;1tY^1GH@jw4VT)#$gQWXUZ2(qw8%qhSpIoJku>0RllfQ}5rr3Kb-o9ufwQ=6;H<{sS&Uh( zikl>gL3~{Cg9>@Zva{wsfY+Tj{`671tacAkBbkVJAF}M12D0vHdVPFmJ=xSMy55(L zsX1#d3A+{`X-dS=e4O)FvlfGHDLw3xA%u|_p8*-ce8w)eNV+`|)4DLZSdUC<5!()l zHNy1>2c1F@IAG zrKI!8{09l2ymVjJU(g+&7cTKfS8m`hsl$*A%368-O|b$ z{0a%$CRw#MZ5tp#|CkR_@YOZ`xieZsVa*+&3Rx7ZP1`k2Lg7^z8n%c@!5!Y7bHGah z^4gmmUN7)tG{nV{!{Mo93g-O=8slO+s6TwVsj?xi7@4Ocr|2#Rr5MXfy$V3v4gsrX zpX?#FIUfY0;v-1#-8Mk*DLath1AV9>;GzY-VgxJ|@x`JgUzqeUB@>tcDat!_W?$-6B?1o# z!it%a9I$Q_HPp0xGzW}8xBxI<%hafsrN$TA@Hl%P#=+&-|6J;jColdK-esBDaavDF-Ttc|!!3!oW62*;iJzt6k3Uz3@Eyt{A ziCp*F1}%VQO2y)?~9~z^}$!}iHQLh4iDeG=e|aYz45bp6LBggqqDHPFzqoi z^vpt;IXat(vk}nG;8vrtUCn19zxa7-{c6_a)ZS1d`0W@m(l8BW7OVt$#?ElO{X8#H z6#Kg!3l!wW&lAas>Mq~WWE5z_^i@BLE0jG*_BKFx=$bf>{a#IO5X+ff)@xwDtw>mH zK@j zVu4Vm6jBL$ActUAS)!2&vW3*pNfLyn6Ulf%CWuTYnLT*jpdjF9AV*lo$Tm$=xKO@c zxqOLSfHBinpzZ~{St{!R7aS@;s3P^VXo%~yDL#FE*{YTg^9)opapSN6 zwg3TD>QFj57A&@Yx{`pQTBX4QNkdz zS*i}OIGYJbRb*v%i!~U7nRKB(r%0D~;6TAHBnZ669Z*IDNNlA(XlrjQ0G%XZf*9y8 zkRWAD;Sdlu13dv3u(SIwfU_zLs8L?Mz=Ak6mf`MYEU1L?a`8n7zGqzmed=vDDhSvg7pGUjAb^0wowG?uvlrfKs`r^MA z3c<4?wo0kS)k^XCJh2XEv+T2D6pP-0HK>x}MMyRG~k- z6&fB_+ys(?im@gjUkkN&^y}3~IjL;a=pGc`A@=_<9O1enIG~9zmMuCxhA+8iCp^sO-e;g@Go`k6<56gYhwvdVNfPS{p#EnOy`CgNWd6c8 z!~-=Kaf(4|N6OLwj;S2@Ak?zRY5_EC>U8D=tFz-KiHqdsJyHh#Ly&QhRO`%(%5R|E zThimSp_U$KqU7XVG+mVYsG^ms@E3aD-%Yu1n5Xr1 zli|qV>HTh{oMMg^Z@2I@=Sg#P*;&OPMb^oSkiD8|)VG+(a$^~9B=NrX-6t5!mT`V7 zXyui7PAzU*`q##9qs3~Of6-`Lt?SZ(@;61d@Ull2ccR_BYg0U1ozp9D3OAu)@g%jw z`gqJdl|e7+UDfA>p7hN0eCm=CR`z^Y@nCfQzI8i`j-KSvW~Ta$)K-k<+Qm(mQ?>@# zt4>99KMyY)%^o_s82kcXjdQr*ELhUKKl$P}UDctgz_5j!xoE`=WoY-M*z!8z?y6z` zx#kxW58QTcAL(m;<-f;`F7p~q(@YyG8TPK`<9i%X+NxN5- zFkFJ~+wWaS4;EhaMQ-cbv{-g;yKj-}B&OB!(R^*KUyehN0~vo7!kZ)gcZ%oz-8U5lTC(|t zR$8gwb_WyZi0~S5^zX((mrxlk(W)=18j}*1#|a9iRn<7xSVcZ-ZBuR+Sxe;#n{rj( z>*$_=zLIK{EbPtx{tl@kYZLPwt;t&sB6h`vI$K3(&52fC-G{W!)xqC;TK_yWUpo|f zzOGj>cQ%@78M+@A*>9hd_T1OyhO|n{rH50Vbbl$tqq@;QCP{WXZ=lb;vh&vfx0cr0 zXO0$2lR-CVA%>>SA^=iED+gbA;8;t9u)w zt(c31J@)+^YO%zn;-}6NN4%mo-Rf1pU+mDUsOkO8yS9I(d^mWVxvAy_$7ZHQ-a?wp zcmB0j!2j+zu~enucD}hsx}zd6?mPZX^7;4byQ-gk%anJw@#tdpWE)|jXvu%Nwl{EO z(B3^rfBLw6i2Opp(kBt>*kT#I%zS{^K0{k4{$5okt=RqX72@+Tv$57S&GoGbFKdI+ Wq=9KU{hq9)Rb7K~S>bi7R{aO-uwYmK literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins8.nbt b/common-1.21.1/src/main/resources/data/antarchy/structure/underside_ruins/underside_ruins8.nbt new file mode 100644 index 0000000000000000000000000000000000000000..9c40094ad6e4533531b7b4356842200e159f3cd4 GIT binary patch literal 8148 zcmb7o30#v`x_8xLJ1AgF(IDH5V{t(w5OxAguUwtB0qV8NzQh!wO+b-FAwsIC6bVpE ziwO|0;y`Z+LJVL56E+ED$fBhULAJ6b*aVOQLALNc2XLx0-}l|Q{N5k$dC&5kbNO}JZodww&wxjuYAB5+RU;UBgiGFP8-@d*vUyuGW` z-jwiKvPK9-( zblQ(g^!;Vl z>x7kD;}h7@4Y+SHMlvWPmk@4|&fqC1yaC$KzSMb*&r zpG=jB&jR_^hkHBtvbQ=bFr{I(l3OPW-fMMkxgK-PXqd5IXgn%xF9;IN$Fx$Kyd*9E z`hbwJKy162a%1dvsfA?&E4OxEH zz{2fJg#$;f0HqZ7IhLa7OjTRk5wtEsSpA-^XQ!)Xd;|$#0vs;C-n=YG4b31ab zJIL)4=#TAce8h>EpwiC#0d{)tXWY$pUni!4c@^tM1~RbfCFF%YHdDmKN$C#VlAl3d*qiW}v# z$qD#U9bx~RBrBVEDLu<~GM77hyhFaTYIv)m85vVA?2fs{rF3$d=exNi*5YWVZkvyl zsayG3byYJLePqw^8<}aPZRXpveB-v#?h}qR;kVY57MYYbdJS&{%ToxSmQva@6j0sw z&9<1JFa?HDZWFsT@&q?5LEp2?Ka6aoQgKcuvyXEsc-Lp+PjCg2{j#p^sfGQfMPnFE zG;0iRKvG#5mo~~5?!{cIjj`*p?5O}n4C}UqQhxW_jM-Qj!NwTwjFL4)3 z5{Ku!r-w=Y;cCI@l#2yh7=2FSY~}4nuSqWP_M8beA=~lHl6h4BL-cb=jA7lBtC1Fil_cQ;+doH__g)59eBPGJ3G$T>khS+nr3exdc z((!ng2VdfDq+$QPhkq?h;$`0KWvEC+>`w}}@KOAEI(4rmudTrY)PcJyP zcX4?ws2ubge0LC1v7Ff+D88l2l_RmwRbpY^vV1imcOk(k%3%y*=ex_hEj>7`-AkI9FVRj zgSDF}lTqQf=Nz#zT$B%yLw-`w>@Tfyxymg(9ji-n?^L`aOezUE77ioHhJ?6**A4re zn!LKqFe;YfPmEc@^fnj=sN6g81s`8neP4mK0FAUtwF4&91HGazdjpW3mj?TY523}x z&SwQ*;AA-35Qq_t)F0nMh|5e(m!x4I&u>E}Nw9)x?Q`ty@LH7acP6>>A~@t4n4G)5 z0f@X!b7zk6w-e&d=#Ziw!C{}=g4kRAUj8u*CDpMME8C22rDv(UvXLY$K`+CQ{BU*m zPY;U%3b`q#05DH`dN{`-&-3gJPpr(qkZvbEo9Btu^!_)H!15#0)O6ESZVJ=+gtLdt z069$3qpxQLVGF03PaQU z2wX$90dnNnK6%jMPpV3^@DsT)91iE7XO4w#wye8(i7SbW-9TcC6&r=F`Qp|)Cl7{m zc-_H`{^So85MPrwS^jE*Jv#7N`od^*j1*|kiiF)iWlGN0F93dWnzB3IV;3>2&E81Be8WHUy*HK12_VhG6LZUn%^ z1GeA~+5j63u1Nro zKtiyZ-~!N#`0s%7i?M5IEuCim4#_2+~saz1mYd1qQ9gs-v4&TbPpIi(in{xbNBr_65K>*50?L z@dUE9rwFGZ`29BbpW88%Q=6v1g9AJK58>b}-=MR6P8}d}-s%?2?bnzIcitFxW4L#H zLU}`2n0&8#6DjitnLfi|SCAW=E(bu!`~eU+{0ZFV&u|-cttE;GH(nl)$9khsvFnuq zWu6FPh}SCvQis*;Ul}N*AdKF6WdM$|zTNKww7czaj!8D$LfyUR#a7ZIuPj_U!{=}# zhiyG`@3#tC{5Nrv)6ysEiE3POO#B^Q%jr1Ds=c9#bTbnwKtkbQjqW$cB)=g<$KG=4Yo$}bb0zkRm)2KH&k zU*XC=f#6B8Lo`q1ICRtgfT5YAe)9FL<^1?=T*T#(5v$513j2 z&d_leb#&Po96<}u}OcVBE;y+(TfktT)}^VC7mjXAn- zAi8ihGF=Lou3V{Bo9cJEq|x7%`Y(Q<;A69@D;{PxJ8N9(M@&OkjcS{4feFV+7U8Ko zwV{S&PIl%)z?1anDHxIe70%@0__hJD#Aw*x!XzD-p-n?yslv(H0)-3y9sU*+V-*Q; zj4c4;L1JEb4r$$_($~}q``AGr#k+kF${^6Is3_2PQz6jvx@&cWg?hZ$Eer>DJb3#c*@-IzThw%*2FXeklx$| ztXtj01;UOxdjKViu*7*goL{d7`g6ICay!}PAmNkn4gd{xBj(<0XwXnd78()amM;Tt zVCH>NF!Q=1F!T6^PXvM+WX{uf5!HIzusY$tRAC0du?@oko>#F&XZ=^GSAhUf0h&&v z5wuEEP{=MuP0-qm$d>toEz%DL>1P`VhZ}lJ@unx>Cac;BMT;w7F`|Pmw5tkPcsvB* zS=ZQ2!X!45h6c>&0v36-g@|7T$ipn4c2__?i4Dl}K~GPgPtW2F`z9L^_SZLlJ`}d)&FbUIF>Oig^7BX-*sd!aGKrli?>z@KgiK|LlAXGAIP3t) z@ht2|W zZ&MC3X1629wMLE`MD=N_b+N`irUf#`+^q>Sh1(-ToABR;-zGtZvfJev3o1R3_dYeG z(SHw@@-8EJ;3gZeTNJ1Z{$LnlMdakjU9WO|PEw48uIYS>RA`zzIh5LzMp>^=tJXTAGJJK6hzLf7{@{P&zTR_(SXvF}8PI#Xr~B zsUYzGR5Nf*{r0JOpCp?CPSeKDvhW2X(XGobeh47!XP(x0(0`K4Y?`j_Du>%rsFLQk>RJ{HV z4|j4qZ%&9cGib<1RV3$|Zd$|9t0e4=|L>!j+mFKMj5==%#6?<2WbY>u(ts2vtNya< z@Ahw~{s0`o+0*FXb+7O>QbJtF-Rel1T~RpstV+h47LpWcjX~ssE&jmHEP=GPIUNpeQK-X4+G-LVTXg{3BoJM-2UypV^60uF%x7q-4=uCDpV*V+IiaI4I* zJ{K{wdO8(iM{){8Zcrmv*#_HFPNk=@JaR8QPeoUPUMU6?vC1^?QzWU#7N|{)yQaVp zMlg(IA=EA0YmrJof1p%F_DkV`_iLD?gNVt>K;ZLF(QyA#BH~og7 zP7pFhr!S>TOwi%jcv2J=+`lG=17reC31q>*a1hA!ET@ml&DSfuoJ1RHc6Add5Xerp zkCE(q6QZ}b6q@TK4tibZbhk4vQ47RwQ~j5D8V4TR1w;cr0E7VLcsvlzY~4dHp@OIS zBN7ZyTO(fIj(9x-&2L4-Gz7$yMFLN9%~}pE0tBFGBa@}jf@mVwF* zu#a~{*mqOcC|?o@MCj0BU$>yXN%~x4(ywSM16v)a%y{wwgnG2WMynb z|0|j`sP3#mc?y~N;opjM5A;`mZVL`g5&OcBog=vW6c~E1)5HRm5MgoI@{twX* zK+8kWb|XDd*X%mp5%EkuD1j{oB}gJ6)UCeJ&HrTu)TFDBtPLQ{-==H#N`K$BrtO7_ zN-N#X=vrqf`ke*kX-HEgP%Lj{BzN)qIvVA3gFWy87eA;w9H-dT`A7{vgzAa=!JH29 zs<%QDxsH8M2UhloYQ36*U5kWF5IL10rw|8aRoX)~^7KBujgO!I38u^C2bE zxSxrg+Gbf-0&CE>?2#gqZeA0?`KFrTP?gKQCbKg$Sh>?tU~g=&VlVZld=P5YX(%EC zGp9>gxhEm2QczTNU`eqzq*z(r+eKS?NagJpuK|It4${M2wMzkokkR}R?m0h=2NIux ziw|EPXMIfdh2Nw(Cuu%bHA;Aa7{Dt}RP^3(S1=-fNKhaT*!xm*H4$4+5CDFP9VpBJ zg);PhH%mNCh%-+`i)@)Otr{efxj-GEAV?H^6&MZYM^x9h zijHFzqiti2EYBGU1Fwhp5;=d9*Xl!)twM}!u61@NdpP&cS(H+gO;ff9u7##Yv-rqAt^XndE$DV9S7(Pm8 zuKbL{EsRwunruz3}sr@8X&5MSaWp+PNh0O?vH;bjJ?W zXik_~+j?%fqxI*`i0R5MQFLX|-O%8u{3h+!o=GV&)fXRxUc9&5KK=82vG;`dJO30DXEXXMMf z+1K0qB%1trU%xV6di>PI`LdrAVro}f47DM#hb;I*iuqqV6Ko%7uGf41=4&JKTe=Yt zyU;N@oS_<33^;Y{Io^Ytr`Ndi!n!m|Ax|tV&)+Sw&&d!M-^`FE(5WlU2BEaUj8Z>d zq^3P7zB;)oB&8-N;`xR6+CZn4>5kT6-%|0&{5f6#J|tR0cmHT|I6G{`<+Qm+5Y^nB zAIyL7eNqzcKkCanr~8VM$-_UZ)z6(ylS>=kccU#_?d@*x9XOT}(?unc8<>=uN?w@A zAxPeBqsUuMn~9R;Kd@PNHi5Z#ufEyF+-6{=IZS>_x+omupLwKACeP%W*hdMwGCD>R z>ZuLQN{c<>Uz8bU3y%l;pM5$ta&mcW;atq@(~?0?`r@-9iw3zz(!J1wg`Q6i+%2Tm zl$DKMT9~->gij8NDl%%C9MGFnpX5F0?aRu2WHT^6!D}r$qP$twRy1)!Xd^3Ajn?r) z`YvTi4?2q5%M{Pj1WEUuDm?1t2QAnYHs%dAZUc2DGgH4VEh%PicBsS=ZpZ#I?RF}L zE9kjZ{O9V$L&`Rjs^oY+b)o0y**h-DwI;F2wMh$c=bxt)siV)`Jl`{4$uqOLsVrJK zepp#Ho-i96I(8xHyiX{{>By$Y!}8^Maz=-5^jySD`_NSM{Nz`me7Q#t`#&6|+v~lV z)EZT5YbUv9PLt$UHk&Ny53iL|C#Ob34-QOrn3>i#Y|0bdah%lAattjUA1 z=Sj2YYEzaQCbdgHN4Ijq4rFI7_Ni7rl7yb2Z~du^CVxG4Tuc7OeXsY#k6(nI?$_8q z*Jf8xQVe=-l`Xzer*|giC{5}1+{ITiKpVeZC%7O82yw3qo$T)w_}lc{cNjM*l2}=s zUXblSVS2m5w81m6_WK7Mmp}4%ba9H7yD4X@dve>yckNX7JB9j0o8gx_GxccC`Yqdy z2>MMy2glEl2Y%zvIk`@rwVdmWcgtBkUCwG>?7rMXuj{+K{o)RCPThYehn4*;#bDq@ z@R_qEf+F01R!t5#Q=3u(d-N_;g^X*(k0akXI5w%0KaKyT&~iNP{F^sbM^qCTbZxOL z8Mlz)L;kL3QE;HQ#k)~!G%%+BOJUejimaU<+7jy7He=&wV^GTMpyLt^|uDHV@A8O8D;e8pcvd#;5I>WrDfNSIjMtb zgD`WKI(YEm%(c`w-}3eqX?8!JkdUT2nXevmniO8B^$)WtQdfL;f2G1pdAE`_`RPv+ v+LEt5>Lx74pH;CABw{E7Grm1-wOUebe=z56o+8zInm+obLghx<@Y??Yp@mb7 literal 0 HcmV?d00001 diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/dread_hallucination_mobs.json b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/dread_hallucination_mobs.json index c3129700..5f5b3a37 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/dread_hallucination_mobs.json +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/dread_hallucination_mobs.json @@ -11,7 +11,7 @@ "minecraft:skeleton", "minecraft:spider", "antarchy:toreterror", - "antarchy:creeping_horror", - "antarchy:lurking_terror" + "antarchy:crawling_blight", + "antarchy:skulking_fright" ] } diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/triffid_prey.json b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/flytrap_prey.json similarity index 100% rename from common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/triffid_prey.json rename to common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/flytrap_prey.json diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_common.json b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_common.json index 3cc117aa..fb7759ba 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_common.json +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_common.json @@ -1,6 +1,6 @@ { "values": [ - "antarchy:creeping_horror", - "antarchy:lurking_terror" + "antarchy:crawling_blight", + "antarchy:skulking_fright" ] } diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_jumpers.json b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_jumpers.json index 298fd78a..aaf442db 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_jumpers.json +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/horde_jumpers.json @@ -1,5 +1,5 @@ { "values": [ - "antarchy:jumpy_bug" + "antarchy:springbug" ] } diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/inverted_immune.json b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/inverted_immune.json index c6e6097f..472cb199 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/inverted_immune.json +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/inverted_immune.json @@ -5,7 +5,7 @@ "antarchy:kraken", "antarchy:reverie", "antarchy:lucid", - "antarchy:triffid", + "antarchy:flytrap", "antarchy:king" ] } diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/queen_does_not_attack.json b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/queen_does_not_attack.json index 59264160..46ed6067 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/queen_does_not_attack.json +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/entity_type/queen_does_not_attack.json @@ -6,8 +6,8 @@ "antarchy:lucid", "antarchy:reverie", "antarchy:bed_bug", - "antarchy:creeping_horror", - "antarchy:lurking_terror", - "antarchy:jumpy_bug" + "antarchy:crawling_blight", + "antarchy:skulking_fright", + "antarchy:springbug" ] } diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/item/big_bertha_ingredient.json b/common-1.21.1/src/main/resources/data/antarchy/tags/item/big_bertha_ingredient.json index e46cf9ad..935bc10b 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/tags/item/big_bertha_ingredient.json +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/item/big_bertha_ingredient.json @@ -8,7 +8,7 @@ "antarchy:basilisk_fang", "antarchy:emperor_scorpion_stinger", "antarchy:ultimate_sword", - "antarchy:cloud_shark_fin", + "antarchy:stratoshark_fin", "antarchy:vortex_charge", "antarchy:kraken_tooth", "antarchy:mantis_claw", @@ -18,11 +18,11 @@ "antarchy:gravity_gun", "antarchy:nightmare_scale", "antarchy:molevore_nose", - "antarchy:jumpy_bug_leg", + "antarchy:springbug_leg", "antarchy:jerry_nucleus", "antarchy:primordial_scute", "antarchy:worm_tooth", "antarchy:hercules_horn", - "antarchy:triffid_goo" + "antarchy:flytrap_goo" ] } diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/sound_event/dread_hallucination_sounds.json b/common-1.21.1/src/main/resources/data/antarchy/tags/sound_event/dread_hallucination_sounds.json index b578f58d..34f98e79 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/tags/sound_event/dread_hallucination_sounds.json +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/sound_event/dread_hallucination_sounds.json @@ -16,8 +16,8 @@ "antarchy:bed_bug_attack", "antarchy:scorpion_ambient", "antarchy:scorpion_attack", - "antarchy:cloud_shark_idle", - "antarchy:cloud_shark_bite", + "antarchy:stratoshark_idle", + "antarchy:stratoshark_bite", "antarchy:nightmare_idle", "antarchy:nightmare_hurt", "antarchy:nightmare_roar", diff --git a/common-1.21.1/src/main/resources/data/antarchy/tags/worldgen/biome/has_structure/underside_ruins_biomes.json b/common-1.21.1/src/main/resources/data/antarchy/tags/worldgen/biome/has_structure/underside_ruins_biomes.json new file mode 100644 index 00000000..144a3162 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/tags/worldgen/biome/has_structure/underside_ruins_biomes.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "antarchy:dream_dunes" + ] +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json index 231ae737..fdaf9a4a 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/brooding_tunnels.json @@ -56,7 +56,7 @@ "antarchy:brooding_tunnels_hanging_creeproots", "antarchy:molting_vines", "antarchy:ground_molting_vines", - "antarchy:jumpy_bug_egg_ceiling", + "antarchy:springbug_egg_ceiling", "antarchy:spit_bug_egg_patch" ] ], diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/cloud_sea.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/cloud_sea.json index 1a3a9124..4568e4ce 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/cloud_sea.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/cloud_sea.json @@ -24,7 +24,7 @@ } }, "spawn_costs": { - "antarchy:cloud_shark": { + "antarchy:stratoshark": { "energy_budget": 0.15, "charge": 22 } @@ -54,7 +54,7 @@ "ambient": [], "monster": [ { - "type": "antarchy:cloud_shark", + "type": "antarchy:stratoshark", "weight": 10, "minCount": 1, "maxCount": 2 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 26d6fc25..4539f8a0 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 @@ -41,7 +41,9 @@ "liquid": [] }, "features": [ - [], + [ + "antarchy:thoraxis_transition_throat" + ], [], [], [], @@ -57,6 +59,7 @@ "antarchy:patch_fire" ], [ + "antarchy:queen_havoc_trail", "antarchy:nyxite_spikes", "antarchy:patch_ceiling_fire" ], diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json index 75688215..c8b8a736 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/ouranwood_forest.json @@ -85,7 +85,7 @@ "antarchy:elythia_rainbow_ant_nests" ], [ - "antarchy:triffid_patch" + "antarchy:flytrap_patch" ] ], "creature_spawn_probability": 0.07, diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/vortex_expanse.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/vortex_expanse.json index 8d2563e2..4a714098 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/vortex_expanse.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/biome/vortex_expanse.json @@ -81,12 +81,6 @@ "minCount": 2, "maxCount": 5 }, - { - "type": "antarchy:emperor_scorpion", - "weight": 3, - "minCount": 1, - "maxCount": 1 - }, { "type": "antarchy:vortex", "weight": 1, diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/flytrap_patch.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/flytrap_patch.json new file mode 100644 index 00000000..c8353cdd --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/flytrap_patch.json @@ -0,0 +1,4 @@ +{ + "type": "antarchy:flytrap_patch", + "config": {} +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/jumpy_bug_egg_ceiling.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/jumpy_bug_egg_ceiling.json deleted file mode 100644 index f63327da..00000000 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/jumpy_bug_egg_ceiling.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:jumpy_bug_egg_ceiling", - "config": {} -} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/queen_havoc_trail.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/queen_havoc_trail.json new file mode 100644 index 00000000..824aca66 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/queen_havoc_trail.json @@ -0,0 +1,4 @@ +{ + "type": "antarchy:queen_havoc_trail", + "config": {} +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/springbug_egg_ceiling.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/springbug_egg_ceiling.json new file mode 100644 index 00000000..b301c183 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/springbug_egg_ceiling.json @@ -0,0 +1,4 @@ +{ + "type": "antarchy:springbug_egg_ceiling", + "config": {} +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/thoraxis_transition_throat.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/thoraxis_transition_throat.json new file mode 100644 index 00000000..e82cb683 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/thoraxis_transition_throat.json @@ -0,0 +1,4 @@ +{ + "type": "antarchy:thoraxis_transition_throat", + "config": {} +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/triffid_patch.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/triffid_patch.json deleted file mode 100644 index 055de6bc..00000000 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/configured_feature/triffid_patch.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "antarchy:triffid_patch", - "config": {} -} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/triffid_patch.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/flytrap_patch.json similarity index 87% rename from common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/triffid_patch.json rename to common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/flytrap_patch.json index f87e45e7..8d03f532 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/triffid_patch.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/flytrap_patch.json @@ -1,5 +1,5 @@ { - "feature": "antarchy:triffid_patch", + "feature": "antarchy:flytrap_patch", "placement": [ { "type": "minecraft:rarity_filter", diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/queen_havoc_trail.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/queen_havoc_trail.json new file mode 100644 index 00000000..53b84287 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/queen_havoc_trail.json @@ -0,0 +1,4 @@ +{ + "feature": "antarchy:queen_havoc_trail", + "placement": [] +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/jumpy_bug_egg_ceiling.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/springbug_egg_ceiling.json similarity index 91% rename from common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/jumpy_bug_egg_ceiling.json rename to common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/springbug_egg_ceiling.json index 66272825..6d37e55a 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/jumpy_bug_egg_ceiling.json +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/springbug_egg_ceiling.json @@ -1,5 +1,5 @@ { - "feature": "antarchy:jumpy_bug_egg_ceiling", + "feature": "antarchy:springbug_egg_ceiling", "placement": [ { "type": "minecraft:count", diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/thoraxis_transition_throat.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/thoraxis_transition_throat.json new file mode 100644 index 00000000..fc182af6 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/placed_feature/thoraxis_transition_throat.json @@ -0,0 +1,24 @@ +{ + "feature": "antarchy:thoraxis_transition_throat", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 128 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:constant", + "value": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/structure/underside_ruins.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/structure/underside_ruins.json new file mode 100644 index 00000000..a0b424d2 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/structure/underside_ruins.json @@ -0,0 +1,27 @@ +{ + "type": "integrated_api:ceiling_structure", + "start_pool": "antarchy:underside_ruins/underside_ruins", + "size": 1, + "y_allowance": { + "min_y_allowed": -256, + "max_y_allowed": 24 + }, + "valid_biome_radius_check": 1, + "biomes": "#antarchy:has_structure/underside_ruins_biomes", + "step": "underground_structures", + "enhanced_terrain_adaptation": { + "type": "integrated_api:none" + }, + "start_height": { + "type": "minecraft:constant", + "value": { + "absolute": -128 + } + }, + "max_roof_search_distance": 256, + "min_roof_thickness": 3, + "min_open_space_below": 16, + "ceiling_offset": 0, + "spawn_overrides": {}, + "liquid_settings": "ignore_waterlogging" +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/structure_set/underside.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/structure_set/underside.json new file mode 100644 index 00000000..e9028e88 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/structure_set/underside.json @@ -0,0 +1,14 @@ +{ + "structures": [ + { + "structure": "antarchy:underside_ruins", + "weight": 1 + } + ], + "placement": { + "salt": 184736291, + "spacing": 24, + "separation": 12, + "type": "integrated_api:advanced_random_spread" + } +} diff --git a/common-1.21.1/src/main/resources/data/antarchy/worldgen/template_pool/underside_ruins/underside_ruins.json b/common-1.21.1/src/main/resources/data/antarchy/worldgen/template_pool/underside_ruins/underside_ruins.json new file mode 100644 index 00000000..aca08e67 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/worldgen/template_pool/underside_ruins/underside_ruins.json @@ -0,0 +1,78 @@ +{ + "name": "antarchy:underside_ruins/underside_ruins", + "fallback": "minecraft:empty", + "elements": [ + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins1", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins2", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins3", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins4", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins5", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins6", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins7", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + }, + { + "weight": 1, + "element": { + "location": "antarchy:underside_ruins/underside_ruins8", + "processors": "antarchy:generic_processor", + "projection": "rigid", + "element_type": "integrated_api:integrated_api_single_pool_element" + } + } + ] +} diff --git a/common-1.21.1/src/main/resources/data/c/tags/item/boots.json b/common-1.21.1/src/main/resources/data/c/tags/item/boots.json index 8a5ef992..781ec3cb 100644 --- a/common-1.21.1/src/main/resources/data/c/tags/item/boots.json +++ b/common-1.21.1/src/main/resources/data/c/tags/item/boots.json @@ -5,7 +5,7 @@ "antarchy:nightmare_boots", "antarchy:blood_crystal_boots", "antarchy:primordial_boots", - "antarchy:jumpy_boots", + "antarchy:springy_boots", "antarchy:royal_guardian_boots", "antarchy:royal_assailant_boots" ] diff --git a/common-1.21.1/src/main/resources/data/c/tags/item/enchantables.json b/common-1.21.1/src/main/resources/data/c/tags/item/enchantables.json index 4c2a9e67..6fb5716b 100644 --- a/common-1.21.1/src/main/resources/data/c/tags/item/enchantables.json +++ b/common-1.21.1/src/main/resources/data/c/tags/item/enchantables.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "antarchy:jumpy_boots", + "antarchy:springy_boots", "antarchy:royal_guardian_shield", "antarchy:royal_assailant_staff" ] diff --git a/common-1.21.1/src/main/resources/data/c/tags/item/foods/soup.json b/common-1.21.1/src/main/resources/data/c/tags/item/foods/soup.json index 0e21e13e..79d431f7 100644 --- a/common-1.21.1/src/main/resources/data/c/tags/item/foods/soup.json +++ b/common-1.21.1/src/main/resources/data/c/tags/item/foods/soup.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "antarchy:cloud_shark_fin_soup" + "antarchy:stratoshark_fin_soup" ] } diff --git a/common-1.21.1/src/main/resources/data/c/tags/item/slime_balls.json b/common-1.21.1/src/main/resources/data/c/tags/item/slime_balls.json index 74e34e54..21acb8ee 100644 --- a/common-1.21.1/src/main/resources/data/c/tags/item/slime_balls.json +++ b/common-1.21.1/src/main/resources/data/c/tags/item/slime_balls.json @@ -2,6 +2,6 @@ "replace": false, "values": [ "minecraft:slime_ball", - "antarchy:triffid_goo" + "antarchy:flytrap_goo" ] } diff --git a/common-1.21.1/src/main/resources/data/c/tags/item/stones.json b/common-1.21.1/src/main/resources/data/c/tags/item/stones.json index 74e34e54..21acb8ee 100644 --- a/common-1.21.1/src/main/resources/data/c/tags/item/stones.json +++ b/common-1.21.1/src/main/resources/data/c/tags/item/stones.json @@ -2,6 +2,6 @@ "replace": false, "values": [ "minecraft:slime_ball", - "antarchy:triffid_goo" + "antarchy:flytrap_goo" ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/enchantment/treasure.json b/common-1.21.1/src/main/resources/data/minecraft/tags/enchantment/treasure.json new file mode 100644 index 00000000..7ba3f616 --- /dev/null +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/enchantment/treasure.json @@ -0,0 +1,6 @@ +{ + "values": [ + "antarchy:feather_rising", + "antarchy:chronosphere" + ] +} diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/entity_type/arthropod.json b/common-1.21.1/src/main/resources/data/minecraft/tags/entity_type/arthropod.json index 042bce23..164f337d 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/entity_type/arthropod.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/entity_type/arthropod.json @@ -9,12 +9,12 @@ "antarchy:bed_bug", "antarchy:mantis", "antarchy:alpha_mantis", - "antarchy:jumpy_bug", + "antarchy:springbug", "antarchy:spit_bug", "antarchy:stink_bug", "antarchy:hercules_beetle", - "antarchy:creeping_horror", - "antarchy:lurking_terror", + "antarchy:crawling_blight", + "antarchy:skulking_fright", "antarchy:rolly_polly", "antarchy:scorpion", "antarchy:emperor_scorpion", diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/durability.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/durability.json index c6bc0cba..65b1799d 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/durability.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/durability.json @@ -29,7 +29,7 @@ "antarchy:blood_crystal_chestplate", "antarchy:blood_crystal_leggings", "antarchy:blood_crystal_boots", - "antarchy:jumpy_boots", + "antarchy:springy_boots", "antarchy:fallen_king_crown", "antarchy:water_cannon", "antarchy:manticore_wings", diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/equippable.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/equippable.json index 11c3af02..82295b97 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/equippable.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/equippable.json @@ -5,7 +5,7 @@ "antarchy:ultimate_bow", "antarchy:ultimate_crossbow", "antarchy:brutalfly_elytra", - "antarchy:jumpy_boots", + "antarchy:springy_boots", "antarchy:manticore_wings", "antarchy:royal_assailant_battleaxe" ] diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/vanishing.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/vanishing.json index 4c2a9e67..6fb5716b 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/vanishing.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/enchantable/vanishing.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "antarchy:jumpy_boots", + "antarchy:springy_boots", "antarchy:royal_guardian_shield", "antarchy:royal_assailant_staff" ] diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/foot_armor.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/foot_armor.json index 8a5ef992..781ec3cb 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/foot_armor.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/foot_armor.json @@ -5,7 +5,7 @@ "antarchy:nightmare_boots", "antarchy:blood_crystal_boots", "antarchy:primordial_boots", - "antarchy:jumpy_boots", + "antarchy:springy_boots", "antarchy:royal_guardian_boots", "antarchy:royal_assailant_boots" ] diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/slime_balls.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/slime_balls.json index 1c54cc36..9d466faa 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/slime_balls.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/slime_balls.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "antarchy:triffid_goo" + "antarchy:flytrap_goo" ] } diff --git a/common-1.21.1/src/main/resources/data/minecraft/tags/item/trimmable_armor.json b/common-1.21.1/src/main/resources/data/minecraft/tags/item/trimmable_armor.json index e100789d..1e349f4d 100644 --- a/common-1.21.1/src/main/resources/data/minecraft/tags/item/trimmable_armor.json +++ b/common-1.21.1/src/main/resources/data/minecraft/tags/item/trimmable_armor.json @@ -15,7 +15,7 @@ "antarchy:nightmare_helmet", "antarchy:primordial_helmet", "antarchy:blood_crystal_helmet", - "antarchy:jumpy_boots", + "antarchy:springy_boots", "antarchy:tigers_eye_helmet", "antarchy:tigers_eye_chestplate", "antarchy:tigers_eye_leggings", 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 599bf583..9bae7b26 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 @@ -98,8 +98,8 @@ public final class AntarchyFabricContent { builder.registerPotionRecipe(potionHolder(AntarchyFabricMisc.TIME_DILATION), Ingredient.of(Items.GLOWSTONE_DUST), potionHolder(AntarchyFabricMisc.LONG_TIME_DILATION)); builder.registerPotionRecipe(potionHolder(AntarchyFabricMisc.TIME_DILATION), Ingredient.of(Items.FERMENTED_SPIDER_EYE), potionHolder(AntarchyFabricMisc.TIME_CONTRACTION)); builder.registerPotionRecipe(potionHolder(AntarchyFabricMisc.TIME_CONTRACTION), Ingredient.of(Items.GLOWSTONE_DUST), potionHolder(AntarchyFabricMisc.LONG_TIME_CONTRACTION)); - builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.CLOUD_SHARK_FIN.get()), net.minecraft.world.item.alchemy.Potions.SLOW_FALLING); - builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.JUMPY_BUG_LEG.get()), Potions.LEAPING); + builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.STRATOSHARK_FIN.get()), net.minecraft.world.item.alchemy.Potions.SLOW_FALLING); + builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.SPRINGBUG_LEG.get()), Potions.LEAPING); builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.CORNEA_EAR.get()), net.minecraft.world.item.alchemy.Potions.NIGHT_VISION); // Corn/syrup/root-beer are plain items, not Potion holders, so vanilla's Builder#expectPotion // rejects them via registerItemRecipe/registerPotionRecipe. The actual output logic comes from @@ -155,11 +155,11 @@ public final class AntarchyFabricContent { AntarchyFabricSounds.ANT_BITE, AntarchyFabricSounds.ANT_GATHER, AntarchyFabricSounds.ANT_NEST, - AntarchyFabricSounds.CLOUD_SHARK_BITE, - AntarchyFabricSounds.CLOUD_SHARK_IDLE, - AntarchyFabricSounds.CLOUD_SHARK_HURT, - AntarchyFabricSounds.CLOUD_SHARK_DEATH, - AntarchyFabricSounds.CLOUD_SHARK_FLY, + AntarchyFabricSounds.STRATOSHARK_BITE, + AntarchyFabricSounds.STRATOSHARK_IDLE, + AntarchyFabricSounds.STRATOSHARK_HURT, + AntarchyFabricSounds.STRATOSHARK_DEATH, + AntarchyFabricSounds.STRATOSHARK_FLY, AntarchyFabricSounds.CATERPILLAR_IDLE, AntarchyFabricSounds.CATERPILLAR_HURT, AntarchyFabricSounds.CATERPILLAR_CRAWL, @@ -219,12 +219,12 @@ public final class AntarchyFabricContent { AntarchyFabricSounds.NIGHTMARE_DEATH, AntarchyFabricSounds.NIGHTMARE_BITE, AntarchyFabricSounds.NIGHTMARE_FLAP, - AntarchyFabricSounds.TRIFFID_ATTACK, - AntarchyFabricSounds.TRIFFID_GRAB, - AntarchyFabricSounds.TRIFFID_HURT, - AntarchyFabricSounds.TRIFFID_DEATH, - AntarchyFabricSounds.TRIFFID_HISS, - AntarchyFabricSounds.TRIFFID_GROWL, + AntarchyFabricSounds.FLYTRAP_ATTACK, + AntarchyFabricSounds.FLYTRAP_GRAB, + AntarchyFabricSounds.FLYTRAP_HURT, + AntarchyFabricSounds.FLYTRAP_DEATH, + AntarchyFabricSounds.FLYTRAP_HISS, + AntarchyFabricSounds.FLYTRAP_GROWL, AntarchyFabricSounds.MANTIS_AMBIENT, AntarchyFabricSounds.MANTIS_HURT, AntarchyFabricSounds.MANTIS_ATTACK, @@ -273,13 +273,13 @@ public final class AntarchyFabricContent { AntarchyFabricSounds.STINK_BUG_IDLE, AntarchyFabricSounds.CAVARYN_HEARTBEAT, AntarchyFabricSounds.ROLLY_POLLY_IDLE, - AntarchyFabricSounds.CREEPING_HORROR_GROWL, - AntarchyFabricSounds.CREEPING_HORROR_HURT, - AntarchyFabricSounds.CREEPING_HORROR_BITE, - AntarchyFabricSounds.LURKING_TERROR_SNARL, - AntarchyFabricSounds.LURKING_TERROR_HURT, - AntarchyFabricSounds.LURKING_TERROR_BITE, - AntarchyFabricSounds.LURKING_TERROR_FLY_LOOP, + AntarchyFabricSounds.CRAWLING_BLIGHT_GROWL, + AntarchyFabricSounds.CRAWLING_BLIGHT_HURT, + AntarchyFabricSounds.CRAWLING_BLIGHT_BITE, + AntarchyFabricSounds.SKULKING_FRIGHT_SNARL, + AntarchyFabricSounds.SKULKING_FRIGHT_HURT, + AntarchyFabricSounds.SKULKING_FRIGHT_BITE, + AntarchyFabricSounds.SKULKING_FRIGHT_FLY_LOOP, AntarchyFabricSounds.DUCT_TAPE_USE, AntarchyFabricSounds.HERCULES_BEETLE_IDLE, AntarchyFabricSounds.HERCULES_BEETLE_HURT, @@ -287,10 +287,10 @@ public final class AntarchyFabricContent { AntarchyFabricSounds.HERCULES_BEETLE_CRY, AntarchyFabricSounds.HERCULES_BEETLE_CHARGE_START, AntarchyFabricSounds.HERCULES_BEETLE_KNOCKED_DOWN, - AntarchyFabricSounds.JUMPY_BUG_IDLE, + AntarchyFabricSounds.SPRINGBUG_IDLE, AntarchyFabricSounds.SPIT_BUG_IDLE, - AntarchyFabricSounds.JUMPY_BUG_HURT, - AntarchyFabricSounds.JUMPY_BUG_JUMP, + AntarchyFabricSounds.SPRINGBUG_HURT, + AntarchyFabricSounds.SPRINGBUG_JUMP, AntarchyFabricSounds.SPIT_BUG_HURT, AntarchyFabricSounds.SPIT_BUG_SPIT, AntarchyFabricSounds.BRUTALFLY_SPIT, @@ -439,14 +439,14 @@ public final class AntarchyFabricContent { AntarchyFabricEntities.CATERPILLAR, AntarchyFabricEntities.BUTTERFLY, AntarchyFabricEntities.REVERIE, - AntarchyFabricEntities.TRIFFID, + AntarchyFabricEntities.FLYTRAP, AntarchyFabricEntities.BRUTALFLY, AntarchyFabricEntities.BRUTALFLY_ORB, AntarchyFabricEntities.HUSH_PROJECTILE, AntarchyFabricEntities.TORETERROR, AntarchyFabricEntities.WATER_BOMB, - AntarchyFabricEntities.CREEPING_HORROR, - AntarchyFabricEntities.LURKING_TERROR, + AntarchyFabricEntities.CRAWLING_BLIGHT, + AntarchyFabricEntities.SKULKING_FRIGHT, AntarchyFabricEntities.STINK_BUG, AntarchyFabricEntities.CHEEP, AntarchyFabricEntities.DORRIE, @@ -475,7 +475,7 @@ public final class AntarchyFabricContent { () -> AntarchyFabricBlocks.SHELLSTONE_BRICK_SLAB.get(), () -> AntarchyFabricBlocks.SHELLSTONE_BRICK_WALL.get(), () -> AntarchyFabricBlocks.CLOUD_BLOCK.get(), - () -> AntarchyFabricBlocks.TRIFFID_GOO_BLOCK.get(), + () -> AntarchyFabricBlocks.FLYTRAP_GOO_BLOCK.get(), () -> AntarchyFabricBlocks.PALE_NYXITE.get(), () -> AntarchyFabricBlocks.NYXITE_SPIKE.get(), () -> AntarchyFabricBlocks.CHITIN_BLOCK.get(), @@ -507,8 +507,8 @@ public final class AntarchyFabricContent { () -> AntarchyFabricBlocks.ORANGE_MILKWEED.get(), () -> AntarchyFabricBlocks.PINK_MILKWEED.get(), () -> AntarchyFabricBlocks.BED_BUG_EGG.get(), - () -> AntarchyFabricBlocks.CREEPING_HORROR_EGG.get(), - () -> AntarchyFabricBlocks.LURKING_TERROR_EGG.get(), + () -> AntarchyFabricBlocks.CRAWLING_BLIGHT_EGG.get(), + () -> AntarchyFabricBlocks.SKULKING_FRIGHT_EGG.get(), () -> AntarchyFabricBlocks.WASP_NEST.get(), () -> AntarchyFabricBlocks.HUSHWEED.get(), () -> AntarchyFabricBlocks.OURANWOOD_SQUIRREL_NEST.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 3abe27ef..7a6b83b5 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 @@ -21,15 +21,20 @@ import com.craisinlord.antarchy.content.command.CavarynCommand; import com.craisinlord.antarchy.content.command.CaterpillarCommand; import com.craisinlord.antarchy.content.command.DimensionalTearCommand; import com.craisinlord.antarchy.content.command.GravityCommand; +import com.craisinlord.antarchy.content.command.QueenLocateCommand; import com.craisinlord.antarchy.content.command.RoyalCommand; import com.craisinlord.antarchy.content.time.TimeDilationCommand; import com.craisinlord.antarchy.content.time.TimeDilationManager; +import com.craisinlord.antarchy.content.time.ChronosphereManager; import com.craisinlord.antarchy.content.item.MinersDreamExcavationManager; import com.craisinlord.antarchy.content.item.WormHookTetherManager; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisUndersideManager; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents; +import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents; +import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper; import net.fabricmc.fabric.api.event.player.AttackEntityCallback; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; @@ -67,6 +72,9 @@ public final class AntarchyFabricEvents { } public static void register() { + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> ChronosphereManager.refresh(handler.player)); + ServerPlayerEvents.AFTER_RESPAWN.register((oldPlayer, newPlayer, alive) -> ChronosphereManager.refresh(newPlayer)); + ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register((player, origin, destination) -> ChronosphereManager.refresh(player)); net.fabricmc.fabric.api.networking.v1.EntityTrackingEvents.START_TRACKING.register((trackedEntity, player) -> { if (trackedEntity instanceof com.craisinlord.antarchy.content.time.TimeDilationEntityAccess access && player instanceof ServerPlayer serverPlayer) { @@ -80,6 +88,7 @@ public final class AntarchyFabricEvents { GravityCommand.register(dispatcher); CaterpillarCommand.register(dispatcher); DimensionalTearCommand.register(dispatcher); + QueenLocateCommand.register(dispatcher); TimeDilationCommand.register(dispatcher); RoyalCommand.register(dispatcher); }); 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 f75efe4b..a4acc47c 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 @@ -18,6 +18,8 @@ import com.craisinlord.antarchy.fabric.AntarchyFabricContent; import com.craisinlord.antarchy.fabric.client.renderer.MultipartPartRenderer; import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback; import net.minecraft.world.entity.EntityType; +import net.minecraft.client.renderer.blockentity.VaultRenderer; +import com.craisinlord.antarchy.content.client.renderer.UnderVaultRenderer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; @@ -90,6 +92,14 @@ public final class AntarchyFabricClientBootstrap { (net.minecraft.world.level.block.entity.BlockEntityType) AntarchyFabricBlocks.CRITTER_CAGE_BLOCK_ENTITY.get(), (BlockEntityRendererProvider) CritterCageRenderer::new ); + BlockEntityRendererRegistry.register( + (net.minecraft.world.level.block.entity.BlockEntityType) AntarchyFabricBlocks.UNDERTRIAL_SPAWNER_BLOCK_ENTITY.get(), + (BlockEntityRendererProvider) UndertrialSpawnerRenderer::new + ); + BlockEntityRendererRegistry.register( + (net.minecraft.world.level.block.entity.BlockEntityType) AntarchyFabricBlocks.UNDERVAULT_BLOCK_ENTITY.get(), + (BlockEntityRendererProvider) UnderVaultRenderer::new + ); EntityRendererRegistry.register(AntarchyFabricEntities.EASTER_BUNNY.get(), EasterBunnyRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.FLYING_SQUIRREL.get(), FlyingSquirrelRenderer::new); @@ -105,7 +115,7 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricEntities.MANTIS.get(), MantisRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.ALPHA_MANTIS.get(), AlphaMantisRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.MOLEVORE.get(), MolevoreRenderer::new); - EntityRendererRegistry.register(AntarchyFabricEntities.TRIFFID.get(), TriffidRenderer::new); + EntityRendererRegistry.register(AntarchyFabricEntities.FLYTRAP.get(), FlytrapRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.OURANWOOD_BOAT_ENTITY.get(), context -> new OuranwoodBoatRenderer<>(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/boat/ouranwood.png"), false)); 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)); @@ -119,7 +129,7 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricEntities.ENCHANTED_GOLDEN_APPLE_COW.get(), AppleCowRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.DIAMOND_MINECART.get(), DiamondMinecartRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.DR_TRAYAURUS.get(), context -> new DrTrayaurusRenderer(context, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "textures/entity/dr_trayaurus.png"))); - EntityRendererRegistry.register(AntarchyFabricEntities.CLOUD_SHARK.get(), CloudSharkRenderer::new); + EntityRendererRegistry.register(AntarchyFabricEntities.STRATOSHARK.get(), StratosharkRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.KRAKEN.get(), KrakenRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.KRAKEN_PART.get(), MultipartPartRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.TENTACLE.get(), com.craisinlord.antarchy.content.client.renderer.TentacleRenderer::new); @@ -165,8 +175,8 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricEntities.ELKA.get(), com.craisinlord.antarchy.content.client.renderer.ElkaRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.ROLLY_POLLY.get(), com.craisinlord.antarchy.content.client.renderer.RollyPollyRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.TERMITE.get(), TermiteRenderer::new); - EntityRendererRegistry.register(AntarchyFabricEntities.CREEPING_HORROR.get(), CreepingHorrorRenderer::new); - EntityRendererRegistry.register(AntarchyFabricEntities.LURKING_TERROR.get(), LurkingTerrorRenderer::new); + EntityRendererRegistry.register(AntarchyFabricEntities.CRAWLING_BLIGHT.get(), CrawlingBlightRenderer::new); + EntityRendererRegistry.register(AntarchyFabricEntities.SKULKING_FRIGHT.get(), SkulkingFrightRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.MANTICORE.get(), com.craisinlord.antarchy.content.client.renderer.ManticoreRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.HERCULES_BEETLE.get(), HerculesBeetleRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.PRINCE.get(), com.craisinlord.antarchy.content.client.renderer.RoyalMountRenderer::new); @@ -177,7 +187,7 @@ public final class AntarchyFabricClientBootstrap { EntityRendererRegistry.register(AntarchyFabricEntities.ROYAL_ELEMENTAL_PROJECTILE.get(), com.craisinlord.antarchy.content.client.renderer.RoyalElementalProjectileRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.ROYAL_ICE_SPIKE.get(), com.craisinlord.antarchy.content.client.renderer.RoyalIceSpikeRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.JERRY.get(), JerryRenderer::new); - EntityRendererRegistry.register(AntarchyFabricEntities.JUMPY_BUG.get(), JumpyBugRenderer::new); + EntityRendererRegistry.register(AntarchyFabricEntities.SPRINGBUG.get(), SpringbugRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.SPIT_BUG.get(), SpitBugRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.SPIT_BUG_PROJECTILE.get(), SpitBugProjectileRenderer::new); EntityRendererRegistry.register(AntarchyFabricEntities.STINK_BUG.get(), StinkBugRenderer::new); @@ -319,6 +329,9 @@ public final class AntarchyFabricClientBootstrap { registry.register(AntarchyFabricMisc.ORANGE_ASH.get(), OrangeAshParticle.Provider::new); registry.register(AntarchyFabricMisc.LUCID_BOLT_IMPACT_SMALL.get(), LucidBoltImpactParticle.SmallProvider::new); registry.register(AntarchyFabricMisc.LUCID_BOLT_IMPACT_LARGE.get(), LucidBoltImpactParticle.LargeProvider::new); + registry.register(AntarchyFabricMisc.UNDERTRIAL_SPAWNER_DETECTION.get(), UndertrialParticle.DetectionProvider::new); + registry.register(AntarchyFabricMisc.UNDERTRIAL_OMEN.get(), UndertrialParticle.OmenProvider::new); + registry.register(AntarchyFabricMisc.UNDERVAULT_CONNECTION.get(), UndertrialParticle.OmenProvider::new); } private static void registerRenderLayers() { @@ -410,7 +423,7 @@ public final class AntarchyFabricClientBootstrap { BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.LUMEN_BLOCK.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.ELYTHIA_PORTAL.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.THORAXIS_PORTAL.get(), RenderType.translucent()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.TRIFFID_GOO_BLOCK.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.FLYTRAP_GOO_BLOCK.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.VORTEX_LENS.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.URANIUM_DOOR.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.TITANIUM_DOOR.get(), RenderType.cutout()); @@ -420,13 +433,15 @@ public final class AntarchyFabricClientBootstrap { BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.TITANIUM_BARS.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.CLOUD_BLOCK.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.LUCID_ANCHOR.get(), RenderType.translucent()); - BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.JUMPY_BUG_EGG.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.SPRINGBUG_EGG.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.SPIT_BUG_EGG.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.JERRY_EGG.get(), RenderType.translucent()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.BIOWART_TENDRILS.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.HANGING_CREEPROOTS.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.MOLTING_VINES.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.GLOWCAP_MUSHROOM.get(), RenderType.cutout()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.UNDERTRIAL_SPAWNER.get(), RenderType.cutout()); + BlockRenderLayerMap.INSTANCE.putBlock(AntarchyFabricBlocks.UNDERVAULT.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putFluids( RenderType.translucent(), AntarchyFabricMisc.BILE.get(), @@ -534,7 +549,7 @@ public final class AntarchyFabricClientBootstrap { ParalyzedClientHandler.clampPlayerInput(client.player); } BrutalflyElytraClientHandler.tick(); - JumpyBootsClientHandler.tick(); + SpringyBootsClientHandler.tick(); DiamondMinecartClientHandler.tick(); ParalyzedClientHandler.tick(); DreadClientHandler.tick(); @@ -570,8 +585,8 @@ public final class AntarchyFabricClientBootstrap { com.craisinlord.antarchy.content.client.GlimmeringHudRenderer.render(guiGraphics); ParalyzedHudRenderer.render(guiGraphics); BrutalflyElytraHudRenderer.render(guiGraphics); - JumpyBootsHudRenderer.render(guiGraphics); - TriffidGooHudRenderer.render(guiGraphics); + SpringyBootsHudRenderer.render(guiGraphics); + FlytrapGooHudRenderer.render(guiGraphics); DorrieJumpHudRenderer.render(guiGraphics); HerculesBeetleChargeHudRenderer.render(guiGraphics); }); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/TriffidGooHudRenderer.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/FlytrapGooHudRenderer.java similarity index 92% rename from fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/TriffidGooHudRenderer.java rename to fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/FlytrapGooHudRenderer.java index c2c59d05..162b2b73 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/TriffidGooHudRenderer.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/FlytrapGooHudRenderer.java @@ -9,8 +9,8 @@ import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Block; -public final class TriffidGooHudRenderer { - private TriffidGooHudRenderer() { +public final class FlytrapGooHudRenderer { + private FlytrapGooHudRenderer() { } private static float fadeProgress = 0f; @@ -24,7 +24,7 @@ public final class TriffidGooHudRenderer { fadeProgress = Math.max(0f, fadeProgress - FADE_SPEED); if (fadeProgress <= 0f) return; } else { - Block goo = AntarchyFabricBlocks.TRIFFID_GOO_BLOCK.get(); + Block goo = AntarchyFabricBlocks.FLYTRAP_GOO_BLOCK.get(); BlockPos feet = player.blockPosition(); boolean inGoo = player.level().getBlockState(feet).is(goo) || player.level().getBlockState(feet.above()).is(goo); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/JumpyBootsClientHandler.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SpringyBootsClientHandler.java similarity index 71% rename from fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/JumpyBootsClientHandler.java rename to fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SpringyBootsClientHandler.java index 1c3a31a9..6694d0cb 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/JumpyBootsClientHandler.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SpringyBootsClientHandler.java @@ -1,19 +1,19 @@ package com.craisinlord.antarchy.fabric.client; -import com.craisinlord.antarchy.content.item.JumpyBootsHelper; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; -import com.craisinlord.antarchy.content.network.JumpyBootsLaunchPayload; +import com.craisinlord.antarchy.content.item.SpringyBootsHelper; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; +import com.craisinlord.antarchy.content.network.SpringyBootsLaunchPayload; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; -public final class JumpyBootsClientHandler { +public final class SpringyBootsClientHandler { private static int chargeTicks = 0; private static boolean wasCharging = false; private static int primeWindowTicks = 0; private static int storedChargeTicks = 0; - private JumpyBootsClientHandler() { + private SpringyBootsClientHandler() { } public static void tick() { @@ -25,7 +25,7 @@ public final class JumpyBootsClientHandler { return; } - if (!JumpyBootsItem.isWearingJumpyBoots(player)) { + if (!SpringyBootsItem.isWearingSpringyBoots(player)) { reset(); return; } @@ -37,7 +37,7 @@ public final class JumpyBootsClientHandler { if (primeWindowTicks > 0) { primeWindowTicks--; if (jumpPressed) { - ClientPlayNetworking.send(new JumpyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); + ClientPlayNetworking.send(new SpringyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); reset(); return; } @@ -54,22 +54,22 @@ public final class JumpyBootsClientHandler { } if (jumpPressed && wasCharging && chargeTicks > 0) { - ClientPlayNetworking.send(new JumpyBootsLaunchPayload(chargeTicks, player.isSprinting())); + ClientPlayNetworking.send(new SpringyBootsLaunchPayload(chargeTicks, player.isSprinting())); reset(); return; } if (sneaking) { - chargeTicks = Math.min(chargeTicks + 1, JumpyBootsHelper.CHARGE_TICKS_MAX); + chargeTicks = Math.min(chargeTicks + 1, SpringyBootsHelper.CHARGE_TICKS_MAX); wasCharging = true; } else if (wasCharging && chargeTicks > 0) { storedChargeTicks = chargeTicks; if (jumpPressed) { - ClientPlayNetworking.send(new JumpyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); + ClientPlayNetworking.send(new SpringyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); reset(); return; } - primeWindowTicks = JumpyBootsHelper.PRIME_WINDOW_TICKS; + primeWindowTicks = SpringyBootsHelper.PRIME_WINDOW_TICKS; chargeTicks = 0; wasCharging = false; } else { diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/JumpyBootsHudRenderer.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SpringyBootsHudRenderer.java similarity index 76% rename from fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/JumpyBootsHudRenderer.java rename to fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SpringyBootsHudRenderer.java index ad747b14..87c0b0df 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/JumpyBootsHudRenderer.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SpringyBootsHudRenderer.java @@ -1,20 +1,20 @@ package com.craisinlord.antarchy.fabric.client; -import com.craisinlord.antarchy.content.item.JumpyBootsHelper; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; +import com.craisinlord.antarchy.content.item.SpringyBootsHelper; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; -public final class JumpyBootsHudRenderer { +public final class SpringyBootsHudRenderer { private static final ResourceLocation JUMP_BAR_BACKGROUND = ResourceLocation.withDefaultNamespace("textures/gui/sprites/hud/jump_bar_background.png"); private static final ResourceLocation JUMP_BAR_PROGRESS = ResourceLocation.withDefaultNamespace("textures/gui/sprites/hud/jump_bar_progress.png"); private static final int BAR_WIDTH = 182; private static final int BAR_HEIGHT = 5; - private JumpyBootsHudRenderer() { + private SpringyBootsHudRenderer() { } public static void render(GuiGraphics guiGraphics) { @@ -23,10 +23,10 @@ public final class JumpyBootsHudRenderer { if (player == null || mc.screen != null || player.isDeadOrDying()) { return; } - if (!JumpyBootsItem.isWearingJumpyBoots(player)) { + if (!SpringyBootsItem.isWearingSpringyBoots(player)) { return; } - if (!JumpyBootsClientHandler.isCharging()) { + if (!SpringyBootsClientHandler.isCharging()) { return; } @@ -37,8 +37,8 @@ public final class JumpyBootsHudRenderer { guiGraphics.blit(JUMP_BAR_BACKGROUND, x0, y0, 0, 0, BAR_WIDTH, BAR_HEIGHT, BAR_WIDTH, BAR_HEIGHT); - int chargeTicks = JumpyBootsClientHandler.getChargeTicks(); - float chargeRatio = Mth.clamp(chargeTicks / (float) JumpyBootsHelper.CHARGE_TICKS_MAX, 0.0F, 1.0F); + int chargeTicks = SpringyBootsClientHandler.getChargeTicks(); + float chargeRatio = Mth.clamp(chargeTicks / (float) SpringyBootsHelper.CHARGE_TICKS_MAX, 0.0F, 1.0F); int filledWidth = Mth.clamp((int) (chargeRatio * BAR_WIDTH), 0, BAR_WIDTH); if (filledWidth > 0) { guiGraphics.setColor(1.0F, 1.0F, 1.0F, 0.35F + chargeRatio * 0.65F); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/JumpyBootsFallDamageMixin.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/SpringyBootsFallDamageMixin.java similarity index 65% rename from fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/JumpyBootsFallDamageMixin.java rename to fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/SpringyBootsFallDamageMixin.java index 80fcff70..e1d6872e 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/JumpyBootsFallDamageMixin.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/SpringyBootsFallDamageMixin.java @@ -1,12 +1,10 @@ package com.craisinlord.antarchy.fabric.mixin; import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi; -import com.craisinlord.antarchy.content.item.BloodCrystalArmorItem; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; -import com.craisinlord.antarchy.content.item.royal.RoyalGearHelper; -import com.craisinlord.antarchy.fabric.util.JumpyBootsFabricHelper; +import com.craisinlord.antarchy.content.enchantment.AntarchyEnchantments; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; +import com.craisinlord.antarchy.fabric.util.SpringyBootsFabricHelper; import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import org.spongepowered.asm.mixin.Mixin; @@ -16,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(LivingEntity.class) -public abstract class JumpyBootsFallDamageMixin { +public abstract class SpringyBootsFallDamageMixin { @Inject(method = "causeFallDamage", at = @At("HEAD"), cancellable = true) private void antarchy$cancelBloodCrystalBootsInvertedFallDamage(float fallDistance, float multiplier, DamageSource source, CallbackInfoReturnable cir) { LivingEntity self = (LivingEntity) (Object) this; @@ -26,8 +24,7 @@ public abstract class JumpyBootsFallDamageMixin { if (!AntarchyGravityApi.isGravityInverted(player)) { return; } - if (!(player.getItemBySlot(EquipmentSlot.FEET).getItem() instanceof BloodCrystalArmorItem) - && !RoyalGearHelper.hasUpwardFallImmunityBoots(player)) { + if (AntarchyEnchantments.featherRisingLevel(player) <= 0) { return; } @@ -36,10 +33,10 @@ public abstract class JumpyBootsFallDamageMixin { } @ModifyVariable(method = "causeFallDamage", at = @At("HEAD"), ordinal = 0, argsOnly = true) - private float antarchy$reduceJumpyBootsFallDamage(float fallDistance) { + private float antarchy$reduceSpringyBootsFallDamage(float fallDistance) { LivingEntity self = (LivingEntity) (Object) this; - if (!JumpyBootsItem.isWearingJumpyBoots(self)) return fallDistance; - long protectionUntil = JumpyBootsFabricHelper.getProtectionUntil(self); + if (!SpringyBootsItem.isWearingSpringyBoots(self)) return fallDistance; + long protectionUntil = SpringyBootsFabricHelper.getProtectionUntil(self); if (self.level().getGameTime() < protectionUntil) { return fallDistance * 0.25F; } diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java index 21486b17..073c07a8 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/network/AntarchyFabricNetworking.java @@ -13,9 +13,9 @@ import com.craisinlord.antarchy.content.entity.HerculesBeetleEntity; import com.craisinlord.antarchy.content.item.BrutalflyElytraFlightHelper; import com.craisinlord.antarchy.content.item.BrutalflyElytraItem; import com.craisinlord.antarchy.content.item.BigBerthaItem; -import com.craisinlord.antarchy.content.item.JumpyBootsHelper; -import com.craisinlord.antarchy.fabric.util.JumpyBootsFabricHelper; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; +import com.craisinlord.antarchy.content.item.SpringyBootsHelper; +import com.craisinlord.antarchy.fabric.util.SpringyBootsFabricHelper; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; import com.craisinlord.antarchy.content.item.EyeOfTheStormItem; import com.craisinlord.antarchy.content.item.GravityGunItem; import com.craisinlord.antarchy.content.item.PortalGunItem; @@ -25,7 +25,7 @@ import com.craisinlord.antarchy.content.tigereye.TigerEyeCamouflageController; import com.craisinlord.antarchy.content.tigereye.TigerEyeCamouflageSync; import com.craisinlord.antarchy.content.entity.DorrieEntity; import com.craisinlord.antarchy.content.network.DorrieJumpInputPayload; -import com.craisinlord.antarchy.content.network.JumpyBootsLaunchPayload; +import com.craisinlord.antarchy.content.network.SpringyBootsLaunchPayload; import com.craisinlord.antarchy.content.weather.ThoraxisWeatherSnapshot; import com.craisinlord.antarchy.fabric.AntarchyFabricContent; import com.craisinlord.antarchy.fabric.entity.multipart.MultipartPartEntity; @@ -97,7 +97,7 @@ public final class AntarchyFabricNetworking { PayloadTypeRegistry.playC2S().register(ToggleRoyalInversionPayload.TYPE, ToggleRoyalInversionPayload.STREAM_CODEC); PayloadTypeRegistry.playC2S().register(DiamondMinecartInputPayload.TYPE, DiamondMinecartInputPayload.STREAM_CODEC); PayloadTypeRegistry.playC2S().register(BrutalflyElytraFlapPayload.TYPE, BrutalflyElytraFlapPayload.STREAM_CODEC); - PayloadTypeRegistry.playC2S().register(JumpyBootsLaunchPayload.TYPE, JumpyBootsLaunchPayload.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register(SpringyBootsLaunchPayload.TYPE, SpringyBootsLaunchPayload.STREAM_CODEC); PayloadTypeRegistry.playC2S().register(DorrieJumpInputPayload.TYPE, DorrieJumpInputPayload.STREAM_CODEC); PayloadTypeRegistry.playC2S().register(com.craisinlord.antarchy.content.network.DorrieChargeJumpPayload.TYPE, com.craisinlord.antarchy.content.network.DorrieChargeJumpPayload.STREAM_CODEC); PayloadTypeRegistry.playC2S().register(HerculesBeetleJumpInputPayload.TYPE, HerculesBeetleJumpInputPayload.STREAM_CODEC); @@ -131,8 +131,8 @@ public final class AntarchyFabricNetworking { context.server().execute(() -> handleDiamondMinecartInput(context.player(), payload))); ServerPlayNetworking.registerGlobalReceiver(BrutalflyElytraFlapPayload.TYPE, (payload, context) -> context.server().execute(() -> handleBrutalflyFlap(context.player(), payload))); - ServerPlayNetworking.registerGlobalReceiver(JumpyBootsLaunchPayload.TYPE, (payload, context) -> - context.server().execute(() -> handleJumpyBootsLaunch(context.player(), payload))); + ServerPlayNetworking.registerGlobalReceiver(SpringyBootsLaunchPayload.TYPE, (payload, context) -> + context.server().execute(() -> handleSpringyBootsLaunch(context.player(), payload))); ServerPlayNetworking.registerGlobalReceiver(DorrieJumpInputPayload.TYPE, (payload, context) -> context.server().execute(() -> handleDorrieJumpInput(context.player(), payload))); ServerPlayNetworking.registerGlobalReceiver(com.craisinlord.antarchy.content.network.DorrieChargeJumpPayload.TYPE, (payload, context) -> @@ -405,25 +405,25 @@ public final class AntarchyFabricNetworking { owner.antarchy$interactMultipartPart(part, serverPlayer, part.position(), hand); } - private static void handleJumpyBootsLaunch(ServerPlayer player, JumpyBootsLaunchPayload payload) { - if (!JumpyBootsItem.isWearingJumpyBoots(player)) return; + private static void handleSpringyBootsLaunch(ServerPlayer player, SpringyBootsLaunchPayload payload) { + if (!SpringyBootsItem.isWearingSpringyBoots(player)) return; if (player.isSpectator() || player.isPassenger()) return; ItemStack boots = player.getItemBySlot(EquipmentSlot.FEET); if (player.getCooldowns().isOnCooldown(boots.getItem())) return; - int clampedCharge = Math.min(payload.chargeTicks(), JumpyBootsHelper.CHARGE_TICKS_MAX); + int clampedCharge = Math.min(payload.chargeTicks(), SpringyBootsHelper.CHARGE_TICKS_MAX); if (clampedCharge <= 0) return; - float verticalBoost = JumpyBootsHelper.verticalBoostFor(clampedCharge); + float verticalBoost = SpringyBootsHelper.verticalBoostFor(clampedCharge); Vec3 current = player.getDeltaMovement(); double newX = current.x; double newZ = current.z; if (payload.sprinting()) { Vec3 look = player.getLookAngle(); - newX += look.x * JumpyBootsHelper.SPRINT_FORWARD_BOOST; - newZ += look.z * JumpyBootsHelper.SPRINT_FORWARD_BOOST; + newX += look.x * SpringyBootsHelper.SPRINT_FORWARD_BOOST; + newZ += look.z * SpringyBootsHelper.SPRINT_FORWARD_BOOST; } player.setDeltaMovement(newX, verticalBoost, newZ); @@ -434,12 +434,12 @@ public final class AntarchyFabricNetworking { player.connection.send(new ClientboundSetEntityMotionPacket(player)); player.level().playSound(null, player.blockPosition(), SoundEvents.SLIME_JUMP, SoundSource.PLAYERS, - 1.0F, 0.6F + (clampedCharge / (float) JumpyBootsHelper.CHARGE_TICKS_MAX) * 0.6F); + 1.0F, 0.6F + (clampedCharge / (float) SpringyBootsHelper.CHARGE_TICKS_MAX) * 0.6F); - JumpyBootsFabricHelper.setProtectionUntil(player, - player.level().getGameTime() + JumpyBootsHelper.FALL_PROTECTION_TICKS); + SpringyBootsFabricHelper.setProtectionUntil(player, + player.level().getGameTime() + SpringyBootsHelper.FALL_PROTECTION_TICKS); - player.getCooldowns().addCooldown(boots.getItem(), JumpyBootsHelper.COOLDOWN_TICKS); + player.getCooldowns().addCooldown(boots.getItem(), SpringyBootsHelper.COOLDOWN_TICKS); } private static void handleDorrieJumpInput(ServerPlayer player, DorrieJumpInputPayload payload) { 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 5f583546..ccdea6bf 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 @@ -14,8 +14,11 @@ import com.craisinlord.antarchy.content.block.entity.DimensionalTearMarkerBlockE import com.craisinlord.antarchy.content.block.entity.PortalGunPortalBaseBlockEntity; import com.craisinlord.antarchy.content.block.entity.PortalGunPortalMasterBlockEntity; import com.craisinlord.antarchy.content.block.entity.PotentNyxiteBlockEntity; +import com.craisinlord.antarchy.content.block.entity.QueenTrailSpawnMarkerBlockEntity; import com.craisinlord.antarchy.content.block.entity.SeashellBlockEntity; import com.craisinlord.antarchy.content.block.entity.UpperBlockEntity; +import com.craisinlord.antarchy.content.block.entity.UndertrialSpawnerBlockEntity; +import com.craisinlord.antarchy.content.block.entity.UnderVaultBlockEntity; import com.craisinlord.antarchy.content.block.entity.VortexLensBlockEntity; import com.craisinlord.antarchy.content.block.entity.WaspNestBlockEntity; import com.craisinlord.antarchy.content.fluid.BileLiquidBlock; @@ -56,6 +59,16 @@ public final class AntarchyFabricBlocks { public static final DeferredRegister> BLOCK_ENTITY_TYPES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, Antarchy.MODID); + public static final DeferredBlock UNDERTRIAL_SPAWNER = BLOCKS.register("undertrial_spawner", + () -> new UndertrialSpawnerBlock(AntarchyFabricBlocks::undertrialSpawnerBlockEntityType, + BlockBehaviour.Properties.ofFullCopy(Blocks.TRIAL_SPAWNER).noOcclusion().isViewBlocking((state, level, pos) -> false))); + public static final DeferredBlock UNDERVAULT = BLOCKS.register("undervault", + () -> new UnderVaultBlock(AntarchyFabricBlocks::underVaultBlockEntityType, + BlockBehaviour.Properties.ofFullCopy(Blocks.VAULT).noOcclusion().isViewBlocking((state, level, pos) -> false))); + public static final DeferredBlock QUEEN_TRAIL_SPAWN_MARKER = BLOCKS.register("queen_trail_spawn_marker", + () -> new QueenTrailSpawnMarkerBlock(AntarchyFabricBlocks::queenTrailSpawnMarkerBlockEntityType, + BlockBehaviour.Properties.ofFullCopy(Blocks.BEDROCK).noLootTable())); + public static final DeferredBlock DUPLICATOR_LOG = BLOCKS.register("duplicator_log", () -> new DuplicatorLogBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_LOG).randomTicks())); @@ -704,8 +717,8 @@ public final class AntarchyFabricBlocks { () -> new RotatedPillarBlock(AntarchyObjects.shellstoneProperties())); - public static final DeferredBlock TRIFFID_GOO_BLOCK = BLOCKS.register("triffid_goo_block", - () -> new com.craisinlord.antarchy.content.block.TriffidGooBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SLIME_BLOCK).noOcclusion().isViewBlocking((s, l, p) -> false).isSuffocating((s, l, p) -> false))); + public static final DeferredBlock FLYTRAP_GOO_BLOCK = BLOCKS.register("flytrap_goo_block", + () -> new com.craisinlord.antarchy.content.block.FlytrapGooBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SLIME_BLOCK).noOcclusion().isViewBlocking((s, l, p) -> false).isSuffocating((s, l, p) -> false))); public static final DeferredBlock CLOUD_BLOCK = BLOCKS.register("cloud_block", @@ -952,8 +965,8 @@ public final class AntarchyFabricBlocks { .replaceable())); - public static final DeferredBlock CREEPING_HORROR_EGG = BLOCKS.register("creeping_horror_egg", - () -> new CreepingHorrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); + public static final DeferredBlock CRAWLING_BLIGHT_EGG = BLOCKS.register("crawling_blight_egg", + () -> new CrawlingBlightEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); public static final DeferredBlock PRINCE_EGG = BLOCKS.register("prince_egg", () -> new com.craisinlord.antarchy.content.block.PrinceEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DRAGON_EGG).randomTicks().noOcclusion())); @@ -961,8 +974,8 @@ public final class AntarchyFabricBlocks { () -> new com.craisinlord.antarchy.content.block.PrincessEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DRAGON_EGG).randomTicks().noOcclusion())); - public static final DeferredBlock JUMPY_BUG_EGG = BLOCKS.register("jumpy_bug_egg", - () -> new JumpyBugEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); + public static final DeferredBlock SPRINGBUG_EGG = BLOCKS.register("springbug_egg", + () -> new SpringbugEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); public static final DeferredBlock SPIT_BUG_EGG = BLOCKS.register("spit_bug_egg", @@ -973,8 +986,8 @@ public final class AntarchyFabricBlocks { () -> new JerryEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG).randomTicks())); - public static final DeferredBlock LURKING_TERROR_EGG = BLOCKS.register("lurking_terror_egg", - () -> new LurkingTerrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); + public static final DeferredBlock SKULKING_FRIGHT_EGG = BLOCKS.register("skulking_fright_egg", + () -> new SkulkingFrightEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); static { @@ -1515,6 +1528,15 @@ public final class AntarchyFabricBlocks { (pos, state) -> new DimensionalTearMarkerBlockEntity(pos, state, AntarchyFabricBlocks::dimensionalTearMarkerBlockEntityType), DIMENSIONAL_TEAR_MARKER.get() ).build(null)); + public static final DeferredHolder, BlockEntityType> QUEEN_TRAIL_SPAWN_MARKER_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("queen_trail_spawn_marker", + () -> BlockEntityType.Builder.of( + (pos, state) -> new QueenTrailSpawnMarkerBlockEntity(pos, state, AntarchyFabricBlocks::queenTrailSpawnMarkerBlockEntityType), + QUEEN_TRAIL_SPAWN_MARKER.get() + ).build(null)); + public static final DeferredHolder, BlockEntityType> UNDERTRIAL_SPAWNER_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("undertrial_spawner", + () -> BlockEntityType.Builder.of((pos, state) -> new UndertrialSpawnerBlockEntity(pos, state, AntarchyFabricBlocks::undertrialSpawnerBlockEntityType), UNDERTRIAL_SPAWNER.get()).build(null)); + public static final DeferredHolder, BlockEntityType> UNDERVAULT_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("undervault", + () -> BlockEntityType.Builder.of((pos, state) -> new UnderVaultBlockEntity(pos, state, AntarchyFabricBlocks::underVaultBlockEntityType), UNDERVAULT.get()).build(null)); @@ -1562,6 +1584,18 @@ public final class AntarchyFabricBlocks { return DIMENSIONAL_TEAR_MARKER_BLOCK_ENTITY.get(); } + private static BlockEntityType queenTrailSpawnMarkerBlockEntityType() { + return QUEEN_TRAIL_SPAWN_MARKER_BLOCK_ENTITY.get(); + } + + private static BlockEntityType undertrialSpawnerBlockEntityType() { + return UNDERTRIAL_SPAWNER_BLOCK_ENTITY.get(); + } + + private static BlockEntityType underVaultBlockEntityType() { + return UNDERVAULT_BLOCK_ENTITY.get(); + } + private static Block smallBloodCrystalBudBlock() { 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 472914ce..dac5c912 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 @@ -4,7 +4,7 @@ import com.craisinlord.antarchy.Antarchy; import com.craisinlord.antarchy.content.entity.AppleCowEntityVariants.AppleCow; import com.craisinlord.antarchy.content.entity.AppleCowEntityVariants.EnchantedGoldenAppleCow; import com.craisinlord.antarchy.content.entity.AppleCowEntityVariants.GoldenAppleCow; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import com.craisinlord.antarchy.content.entity.BedBugEntity; import com.craisinlord.antarchy.content.entity.ButterflyEntity; import com.craisinlord.antarchy.content.entity.CaterpillarEntity; @@ -26,7 +26,7 @@ import com.craisinlord.antarchy.content.time.TimeDilationFieldEntity; import com.craisinlord.antarchy.content.entity.HushProjectileEntity; import com.craisinlord.antarchy.content.entity.CritterCageProjectileEntity; import com.craisinlord.antarchy.content.entity.WormHookProjectileEntity; -import com.craisinlord.antarchy.content.entity.JumpyBugEntity; +import com.craisinlord.antarchy.content.entity.SpringbugEntity; import com.craisinlord.antarchy.content.entity.StinkBugEntity; import com.craisinlord.antarchy.content.entity.HoverboardEntity; import com.craisinlord.antarchy.content.entity.OuranwoodBoatEntity; @@ -60,7 +60,7 @@ import com.craisinlord.antarchy.content.entity.MolewormEntity; import com.craisinlord.antarchy.content.entity.WormEntity; import com.craisinlord.antarchy.content.entity.BomberEntity; import com.craisinlord.antarchy.content.entity.SizeRayProjectileEntity; -import com.craisinlord.antarchy.content.entity.TriffidEntity; +import com.craisinlord.antarchy.content.entity.FlytrapEntity; import com.craisinlord.antarchy.content.entity.WaspEntity; import com.craisinlord.antarchy.content.entity.ant.BaseAntEntity; import com.craisinlord.antarchy.content.entity.ant.BrownAntEntity; @@ -219,11 +219,11 @@ public final class AntarchyFabricEntities { .build("molevore")); - public static final DeferredHolder, EntityType> TRIFFID = ENTITY_TYPES.register("triffid", - () -> EntityType.Builder.of(TriffidEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> FLYTRAP = ENTITY_TYPES.register("flytrap", + () -> EntityType.Builder.of(FlytrapEntity::new, MobCategory.MONSTER) .sized(2.0F, 5.0F) .clientTrackingRange(10) - .build("triffid")); + .build("flytrap")); public static final DeferredHolder, EntityType> BED_BUG = ENTITY_TYPES.register("bed_bug", @@ -254,11 +254,11 @@ public final class AntarchyFabricEntities { .build("bomber")); - public static final DeferredHolder, EntityType> JUMPY_BUG = ENTITY_TYPES.register("jumpy_bug", - () -> EntityType.Builder.of(JumpyBugEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> SPRINGBUG = ENTITY_TYPES.register("springbug", + () -> EntityType.Builder.of(SpringbugEntity::new, MobCategory.MONSTER) .sized(3.0F, 6.0F) .clientTrackingRange(8) - .build("jumpy_bug")); + .build("springbug")); public static final DeferredHolder, EntityType> SPIT_BUG = ENTITY_TYPES.register("spit_bug", @@ -361,11 +361,11 @@ public final class AntarchyFabricEntities { .build("dr_trayaurus")); - public static final DeferredHolder, EntityType> CLOUD_SHARK = ENTITY_TYPES.register("cloud_shark", - () -> EntityType.Builder.of(CloudSharkEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> STRATOSHARK = ENTITY_TYPES.register("stratoshark", + () -> EntityType.Builder.of(StratosharkEntity::new, MobCategory.MONSTER) .sized(2.4F, 0.9F) .clientTrackingRange(10) - .build("cloud_shark")); + .build("stratoshark")); public static final DeferredHolder, EntityType> KRAKEN = ENTITY_TYPES.register("kraken", @@ -605,18 +605,18 @@ public final class AntarchyFabricEntities { - public static final DeferredHolder, EntityType> CREEPING_HORROR = ENTITY_TYPES.register("creeping_horror", - () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.CreepingHorrorEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> CRAWLING_BLIGHT = ENTITY_TYPES.register("crawling_blight", + () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.CrawlingBlightEntity::new, MobCategory.MONSTER) .sized(1.3F, 1.5F) .clientTrackingRange(10) - .build("creeping_horror")); + .build("crawling_blight")); - public static final DeferredHolder, EntityType> LURKING_TERROR = ENTITY_TYPES.register("lurking_terror", - () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.LurkingTerrorEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> SKULKING_FRIGHT = ENTITY_TYPES.register("skulking_fright", + () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.SkulkingFrightEntity::new, MobCategory.MONSTER) .sized(1.3F, 1.5F) .clientTrackingRange(10) - .build("lurking_terror")); + .build("skulking_fright")); public static final DeferredHolder, EntityType> MANTICORE = ENTITY_TYPES.register("manticore", () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.ManticoreEntity::new, MobCategory.MONSTER) diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntityAttributes.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntityAttributes.java index fb93d88c..8491ec7d 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntityAttributes.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricEntityAttributes.java @@ -1,7 +1,7 @@ package com.craisinlord.antarchy.fabric.registry; import com.craisinlord.antarchy.config.AntarchySettings; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import com.craisinlord.antarchy.content.entity.BedBugEntity; import com.craisinlord.antarchy.content.entity.ButterflyEntity; import com.craisinlord.antarchy.content.entity.CaterpillarEntity; @@ -10,7 +10,7 @@ import com.craisinlord.antarchy.content.entity.flying_squirrel.FlyingSquirrelEnt import com.craisinlord.antarchy.content.entity.ReverieEntity; import com.craisinlord.antarchy.content.entity.MissileSquidEntity; import com.craisinlord.antarchy.content.entity.lucid.LucidEntity; -import com.craisinlord.antarchy.content.entity.JumpyBugEntity; +import com.craisinlord.antarchy.content.entity.SpringbugEntity; import com.craisinlord.antarchy.content.entity.StinkBugEntity; import com.craisinlord.antarchy.content.entity.AlphaMantisEntity; import com.craisinlord.antarchy.content.entity.MantisEntity; @@ -26,7 +26,7 @@ import com.craisinlord.antarchy.content.entity.OctopusBombEntity; import com.craisinlord.antarchy.content.entity.MolevoreEntity; import com.craisinlord.antarchy.content.entity.MolewormEntity; import com.craisinlord.antarchy.content.entity.BomberEntity; -import com.craisinlord.antarchy.content.entity.TriffidEntity; +import com.craisinlord.antarchy.content.entity.FlytrapEntity; import com.craisinlord.antarchy.content.entity.WaspEntity; import com.craisinlord.antarchy.content.entity.WormEntity; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; @@ -70,7 +70,7 @@ public final class AntarchyFabricEntityAttributes { FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.GOLDEN_APPLE_COW.get(), cowAttributes); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.ENCHANTED_GOLDEN_APPLE_COW.get(), cowAttributes); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.DR_TRAYAURUS.get(), Villager.createAttributes().build()); - FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.CLOUD_SHARK.get(), CloudSharkEntity.createAttributes().build()); + FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.STRATOSHARK.get(), StratosharkEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.KRAKEN.get(), KrakenEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.MISSILE_SQUID.get(), MissileSquidEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.OCTOPUS_BOMB.get(), OctopusBombEntity.createAttributes().build()); @@ -80,20 +80,20 @@ public final class AntarchyFabricEntityAttributes { FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.STINK_BUG.get(), StinkBugEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.WASP.get(), WaspEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.BOMBER.get(), BomberEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.JUMPY_BUG.get(), JumpyBugEntity.createAttributes().build()); + FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.SPRINGBUG.get(), SpringbugEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.SPIT_BUG.get(), com.craisinlord.antarchy.content.entity.SpitBugEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.MANTIS.get(), MantisEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.ALPHA_MANTIS.get(), AlphaMantisEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.ROLLY_POLLY.get(), RollyPollyEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.TRIFFID.get(), TriffidEntity.createAttributes().build()); + FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.FLYTRAP.get(), FlytrapEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.LUCID.get(), LucidEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.VORTEX.get(), com.craisinlord.antarchy.content.entity.vortex.VortexEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.SCORPION.get(), ScorpionEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.BASILISK.get(), BasiliskEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.EMPEROR_SCORPION.get(), EmperorScorpionEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.TORETERROR.get(), ToreterrorEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.CREEPING_HORROR.get(), com.craisinlord.antarchy.content.entity.CreepingHorrorEntity.createAttributes().build()); - FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.LURKING_TERROR.get(), com.craisinlord.antarchy.content.entity.LurkingTerrorEntity.createAttributes().build()); + FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.CRAWLING_BLIGHT.get(), com.craisinlord.antarchy.content.entity.CrawlingBlightEntity.createAttributes().build()); + FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.SKULKING_FRIGHT.get(), com.craisinlord.antarchy.content.entity.SkulkingFrightEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.MANTICORE.get(), com.craisinlord.antarchy.content.entity.ManticoreEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.JERRY.get(), com.craisinlord.antarchy.content.entity.JerryEntity.createAttributes().build()); FabricDefaultAttributeRegistry.register(AntarchyFabricEntities.CHEEP.get(), com.craisinlord.antarchy.content.entity.CheepEntity.createAttributes().build()); 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 6a541013..a2702838 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 @@ -260,6 +260,9 @@ public final class AntarchyFabricItems { public static final DeferredItem SEASHELL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.SEASHELL); public static final DeferredItem LUCID_ANCHOR_ITEM = ITEMS.register("lucid_anchor", () -> new LucidAnchorBlockItem(AntarchyFabricBlocks.LUCID_ANCHOR.get(), new Item.Properties().rarity(Rarity.UNCOMMON))); + public static final DeferredItem UNDERTRIAL_SPAWNER_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.UNDERTRIAL_SPAWNER); + public static final DeferredItem UNDERVAULT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.UNDERVAULT); + public static final DeferredItem UNDERTRIAL_KEY = ITEMS.register("undertrial_key", () -> new Item(new Item.Properties())); public static final DeferredItem LOTUS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.LOTUS); @@ -889,8 +892,8 @@ public final class AntarchyFabricItems { public static final DeferredItem SHELLSTONE_PILLAR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.SHELLSTONE_PILLAR); - public static final DeferredItem TRIFFID_GOO_BLOCK_ITEM = ITEMS.register("triffid_goo_block", - () -> new com.craisinlord.antarchy.content.item.TriffidGooBlockItem(AntarchyFabricBlocks.TRIFFID_GOO_BLOCK.get(), new Item.Properties())); + public static final DeferredItem FLYTRAP_GOO_BLOCK_ITEM = ITEMS.register("flytrap_goo_block", + () -> new com.craisinlord.antarchy.content.item.FlytrapGooBlockItem(AntarchyFabricBlocks.FLYTRAP_GOO_BLOCK.get(), new Item.Properties())); public static final DeferredItem PALE_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.PALE_NYXITE); @@ -931,15 +934,15 @@ public final class AntarchyFabricItems { public static final DeferredItem BED_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.BED_BUG_EGG); - public static final DeferredItem CREEPING_HORROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.CREEPING_HORROR_EGG); + public static final DeferredItem CRAWLING_BLIGHT_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.CRAWLING_BLIGHT_EGG); public static final DeferredItem PRINCE_EGG_ITEM = ITEMS.register("prince_egg", () -> new net.minecraft.world.item.BlockItem(AntarchyFabricBlocks.PRINCE_EGG.get(), new Item.Properties().rarity(Rarity.EPIC).fireResistant())); public static final DeferredItem PRINCESS_EGG_ITEM = ITEMS.register("princess_egg", () -> new net.minecraft.world.item.BlockItem(AntarchyFabricBlocks.PRINCESS_EGG.get(), new Item.Properties().rarity(Rarity.EPIC).fireResistant())); - public static final DeferredItem JUMPY_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.JUMPY_BUG_EGG); + public static final DeferredItem SPRINGBUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.SPRINGBUG_EGG); public static final DeferredItem SPIT_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.SPIT_BUG_EGG); public static final DeferredItem JERRY_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.JERRY_EGG); - public static final DeferredItem LURKING_TERROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.LURKING_TERROR_EGG); + public static final DeferredItem SKULKING_FRIGHT_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.SKULKING_FRIGHT_EGG); public static final DeferredItem WASP_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyFabricBlocks.WASP_NEST); @@ -1053,12 +1056,12 @@ public final class AntarchyFabricItems { public static final DeferredItem STINK_BUG_ITEM = ITEMS.registerSimpleItem("stink_bug", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem JUMPY_BUG_LEG = ITEMS.registerSimpleItem("jumpy_bug_leg", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final DeferredItem SPRINGBUG_LEG = ITEMS.registerSimpleItem("springbug_leg", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem JUMPY_BOOTS = ITEMS.register("jumpy_boots", - () -> new com.craisinlord.antarchy.content.item.JumpyBootsItem( - net.minecraft.core.Holder.direct(AntarchyFabricMisc.JUMPY_BOOTS_ARMOR_MATERIAL.get()), + public static final DeferredItem SPRINGY_BOOTS = ITEMS.register("springy_boots", + () -> new com.craisinlord.antarchy.content.item.SpringyBootsItem( + net.minecraft.core.Holder.direct(AntarchyFabricMisc.SPRINGY_BOOTS_ARMOR_MATERIAL.get()), new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).fireResistant().durability(ArmorItem.Type.BOOTS.getDurability(37)) )); @@ -1207,7 +1210,7 @@ public final class AntarchyFabricItems { .build()))); - public static final DeferredItem TRIFFID_GOO = ITEMS.registerSimpleItem("triffid_goo", + public static final DeferredItem FLYTRAP_GOO = ITEMS.registerSimpleItem("flytrap_goo", new Item.Properties().rarity(Rarity.UNCOMMON)); @@ -1270,11 +1273,11 @@ public final class AntarchyFabricItems { () -> new WormHookItem(new Item.Properties().stacksTo(1).durability(256).rarity(Rarity.UNCOMMON))); - public static final DeferredItem CLOUD_SHARK_FIN = ITEMS.registerSimpleItem("cloud_shark_fin", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final DeferredItem STRATOSHARK_FIN = ITEMS.registerSimpleItem("stratoshark_fin", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem CLOUD_SHARK_FIN_SOUP = ITEMS.register("cloud_shark_fin_soup", - () -> new CloudSharkFinSoupItem(new Item.Properties() + public static final DeferredItem STRATOSHARK_FIN_SOUP = ITEMS.register("stratoshark_fin_soup", + () -> new StratosharkFinSoupItem(new Item.Properties() .stacksTo(1) .craftRemainder(Items.BOWL) .food(new FoodProperties.Builder() @@ -1701,8 +1704,8 @@ public final class AntarchyFabricItems { () -> new DeferredSpawnEggItem(AntarchyFabricEntities.MOLEVORE, 0x4A4A4A, 0x6B4A2B, new Item.Properties().rarity(Rarity.UNCOMMON))); - public static final DeferredItem TRIFFID_SPAWN_EGG = ITEMS.register("triffid_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyFabricEntities.TRIFFID, 0x4C8F3A, 0xFF2FB3, new Item.Properties().rarity(Rarity.UNCOMMON))); + public static final DeferredItem FLYTRAP_SPAWN_EGG = ITEMS.register("flytrap_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyFabricEntities.FLYTRAP, 0x4C8F3A, 0xFF2FB3, new Item.Properties().rarity(Rarity.UNCOMMON))); public static final DeferredItem APPLE_COW_SPAWN_EGG = ITEMS.register("apple_cow_spawn_egg", @@ -1729,8 +1732,8 @@ public final class AntarchyFabricItems { () -> new DeferredSpawnEggItem(AntarchyFabricEntities.BOMBER, 0x7A7A7A, 0xB32020, new Item.Properties())); - public static final DeferredItem JUMPY_BUG_SPAWN_EGG = ITEMS.register("jumpy_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyFabricEntities.JUMPY_BUG, 0x0A1636, 0x8A3E00, new Item.Properties())); + public static final DeferredItem SPRINGBUG_SPAWN_EGG = ITEMS.register("springbug_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyFabricEntities.SPRINGBUG, 0x0A1636, 0x8A3E00, new Item.Properties())); public static final DeferredItem SPIT_BUG_SPAWN_EGG = ITEMS.register("spit_bug_spawn_egg", @@ -1741,8 +1744,8 @@ public final class AntarchyFabricItems { () -> new DeferredSpawnEggItem(AntarchyFabricEntities.STINK_BUG, 0x111111, 0xFF7A00, new Item.Properties())); - public static final DeferredItem CLOUD_SHARK_SPAWN_EGG = ITEMS.register("cloud_shark_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyFabricEntities.CLOUD_SHARK, 0xDDEAF4, 0x7F96A8, new Item.Properties())); + public static final DeferredItem STRATOSHARK_SPAWN_EGG = ITEMS.register("stratoshark_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyFabricEntities.STRATOSHARK, 0xDDEAF4, 0x7F96A8, new Item.Properties())); public static final DeferredItem KRAKEN_SPAWN_EGG = ITEMS.register("kraken_spawn_egg", @@ -1821,12 +1824,12 @@ public final class AntarchyFabricItems { new Item.Properties().stacksTo(1).rarity(Rarity.RARE).fireResistant().durability(ArmorItem.Type.BOOTS.getDurability(37)))); - public static final DeferredItem CREEPING_HORROR_SPAWN_EGG = ITEMS.register("creeping_horror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyFabricEntities.CREEPING_HORROR, 0x6B3A1F, 0x6B0000, new Item.Properties())); + public static final DeferredItem CRAWLING_BLIGHT_SPAWN_EGG = ITEMS.register("crawling_blight_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyFabricEntities.CRAWLING_BLIGHT, 0x6B3A1F, 0x6B0000, new Item.Properties())); - public static final DeferredItem LURKING_TERROR_SPAWN_EGG = ITEMS.register("lurking_terror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyFabricEntities.LURKING_TERROR, 0x2D5A1B, 0x8B0000, new Item.Properties())); + public static final DeferredItem SKULKING_FRIGHT_SPAWN_EGG = ITEMS.register("skulking_fright_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyFabricEntities.SKULKING_FRIGHT, 0x2D5A1B, 0x8B0000, new Item.Properties())); public static final DeferredItem MANTICORE_SPAWN_EGG = ITEMS.register("manticore_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyFabricEntities.MANTICORE, 0xA3AEE9, 0x956570, new Item.Properties())); 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 be3c825b..db4df39b 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 @@ -23,6 +23,7 @@ import com.craisinlord.antarchy.content.worldgen.thoraxis.TyphoniteSpikeConfigur import com.craisinlord.antarchy.content.worldgen.thoraxis.TyphoniteSpikeFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.TyphoniteSwirlFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.PotentNyxiteFeature; +import com.craisinlord.antarchy.content.worldgen.thoraxis.QueenHavocTrailFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisIchorLakeFeature; import com.craisinlord.antarchy.fabric.content.fluid.AntiwaterFluid; import com.craisinlord.antarchy.content.effect.DreadMobEffect; @@ -62,7 +63,7 @@ import com.craisinlord.antarchy.content.worldgen.elythia.OuranwoodTreeConfigurat import com.craisinlord.antarchy.content.worldgen.elythia.OuranwoodTreeFeature; import com.craisinlord.antarchy.content.worldgen.elythia.PeachTreeConfiguration; import com.craisinlord.antarchy.content.worldgen.elythia.PeachTreeFeature; -import com.craisinlord.antarchy.content.worldgen.elythia.TriffidPatchFeature; +import com.craisinlord.antarchy.content.worldgen.elythia.FlytrapPatchFeature; import com.craisinlord.antarchy.content.worldgen.cavaryn.CavarynEggPatchFeature; import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitinSpikeConfiguration; import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitinSpikeFeature; @@ -82,6 +83,7 @@ import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisDuneConfigurat import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisDuneFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisFissureConfiguration; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisFissureFeature; +import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisTransitionThroatFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisBloodCrystalConfiguration; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisBloodCrystalFeature; import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisAntiwaterPoolConfiguration; @@ -374,6 +376,12 @@ public final class AntarchyFabricMisc { public static final DeferredHolder, SimpleParticleType> LUCID_BOLT_IMPACT_LARGE = PARTICLE_TYPES.register("lucid_bolt_impact_large", () -> simpleParticleType()); + public static final DeferredHolder, SimpleParticleType> UNDERTRIAL_SPAWNER_DETECTION = PARTICLE_TYPES.register("undertrial_spawner_detection", + () -> simpleParticleType()); + public static final DeferredHolder, SimpleParticleType> UNDERTRIAL_OMEN = PARTICLE_TYPES.register("undertrial_omen", + () -> simpleParticleType()); + public static final DeferredHolder, SimpleParticleType> UNDERVAULT_CONNECTION = PARTICLE_TYPES.register("undervault_connection", + () -> simpleParticleType()); public static final DeferredHolder, ParticleType> INVERTED_GEYSER_BASE = PARTICLE_TYPES.register("inverted_geyser_base", () -> particleType(InvertedGeyserBaseParticleOptions::codec, InvertedGeyserBaseParticleOptions::streamCodec)); @@ -698,8 +706,8 @@ public final class AntarchyFabricMisc { () -> new MolewormSurfaceMoundsFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, TriffidPatchFeature> TRIFFID_PATCH = FEATURES.register("triffid_patch", - () -> new TriffidPatchFeature(NoneFeatureConfiguration.CODEC)); + public static final DeferredHolder, FlytrapPatchFeature> FLYTRAP_PATCH = FEATURES.register("flytrap_patch", + () -> new FlytrapPatchFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, MapCodec> ELYTHIA_BIOME_SOURCE = BIOME_SOURCES.register("elythia_biome_source", @@ -759,6 +767,11 @@ public final class AntarchyFabricMisc { public static final DeferredHolder, ThoraxisFissureFeature> THORAXIS_FISSURE = FEATURES.register("thoraxis_fissure", () -> new ThoraxisFissureFeature(ThoraxisFissureConfiguration.CODEC)); + public static final DeferredHolder, ThoraxisTransitionThroatFeature> THORAXIS_TRANSITION_THROAT = FEATURES.register("thoraxis_transition_throat", + ThoraxisTransitionThroatFeature::new); + public static final DeferredHolder, QueenHavocTrailFeature> QUEEN_HAVOC_TRAIL = FEATURES.register("queen_havoc_trail", + QueenHavocTrailFeature::new); + public static final DeferredHolder, ThoraxisRibColumnsFeature> THORAXIS_RIB_COLUMNS = FEATURES.register("thoraxis_rib_columns", () -> new ThoraxisRibColumnsFeature(ThoraxisRibColumnsConfiguration.CODEC)); @@ -801,8 +814,8 @@ public final class AntarchyFabricMisc { public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.GroundMoltingVinesFeature> GROUND_MOLTING_VINES = FEATURES.register("ground_molting_vines", () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.GroundMoltingVinesFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.JumpyBugEggCeilingFeature> JUMPY_BUG_EGG_CEILING = FEATURES.register("jumpy_bug_egg_ceiling", - () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.JumpyBugEggCeilingFeature(NoneFeatureConfiguration.CODEC)); + public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.SpringbugEggCeilingFeature> SPRINGBUG_EGG_CEILING = FEATURES.register("springbug_egg_ceiling", + () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.SpringbugEggCeilingFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.SpitBugEggPatchFeature> SPIT_BUG_EGG_PATCH = FEATURES.register("spit_bug_egg_patch", () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.SpitBugEggPatchFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.RollyCavesGiantCavernFeature> ROLLY_CAVES_GIANT_CAVERN = FEATURES.register("rolly_caves_giant_cavern", @@ -878,13 +891,13 @@ public final class AntarchyFabricMisc { () -> ThoraxisBiomeSource.CODEC); - public static final DeferredHolder JUMPY_BOOTS_ARMOR_MATERIAL = ARMOR_MATERIALS.register("jumpy_boots", + public static final DeferredHolder SPRINGY_BOOTS_ARMOR_MATERIAL = ARMOR_MATERIALS.register("springy_boots", () -> new ArmorMaterial( - createJumpyBootsDefense(), + createSpringyBootsDefense(), 15, net.minecraft.sounds.SoundEvents.ARMOR_EQUIP_NETHERITE, () -> Ingredient.of(net.minecraft.world.item.Items.NETHERITE_BOOTS), - java.util.List.of(new ArmorMaterial.Layer(net.minecraft.resources.ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "jumpy_boots"))), + java.util.List.of(new ArmorMaterial.Layer(net.minecraft.resources.ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "springy_boots"))), 3.0F, 0.1F )); @@ -933,7 +946,7 @@ public final class AntarchyFabricMisc { - private static java.util.EnumMap createJumpyBootsDefense() { + private static java.util.EnumMap createSpringyBootsDefense() { java.util.EnumMap defense = new java.util.EnumMap<>(ArmorItem.Type.class); defense.put(ArmorItem.Type.BOOTS, 3); defense.put(ArmorItem.Type.LEGGINGS, 0); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java index eb1634cc..9ce98be8 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java @@ -52,19 +52,19 @@ public final class AntarchyFabricSounds { public static final DeferredHolder ANT_NEST = registerSoundEvent("ant_nest"); - public static final DeferredHolder CLOUD_SHARK_BITE = registerSoundEvent("cloud_shark_bite"); + public static final DeferredHolder STRATOSHARK_BITE = registerSoundEvent("stratoshark_bite"); - public static final DeferredHolder CLOUD_SHARK_IDLE = registerSoundEvent("cloud_shark_idle"); + public static final DeferredHolder STRATOSHARK_IDLE = registerSoundEvent("stratoshark_idle"); - public static final DeferredHolder CLOUD_SHARK_HURT = registerSoundEvent("cloud_shark_hurt"); + public static final DeferredHolder STRATOSHARK_HURT = registerSoundEvent("stratoshark_hurt"); - public static final DeferredHolder CLOUD_SHARK_DEATH = registerSoundEvent("cloud_shark_death"); + public static final DeferredHolder STRATOSHARK_DEATH = registerSoundEvent("stratoshark_death"); - public static final DeferredHolder CLOUD_SHARK_FLY = registerSoundEvent("cloud_shark_fly"); + public static final DeferredHolder STRATOSHARK_FLY = registerSoundEvent("stratoshark_fly"); public static final DeferredHolder CATERPILLAR_IDLE = registerSoundEvent("caterpillar_idle"); @@ -275,22 +275,22 @@ public final class AntarchyFabricSounds { public static final DeferredHolder NIGHTMARE_FLAP = registerSoundEvent("nightmare_flap"); - public static final DeferredHolder TRIFFID_ATTACK = registerSoundEvent("triffid_attack"); + public static final DeferredHolder FLYTRAP_ATTACK = registerSoundEvent("flytrap_attack"); - public static final DeferredHolder TRIFFID_GRAB = registerSoundEvent("triffid_grab"); + public static final DeferredHolder FLYTRAP_GRAB = registerSoundEvent("flytrap_grab"); - public static final DeferredHolder TRIFFID_HURT = registerSoundEvent("triffid_hurt"); + public static final DeferredHolder FLYTRAP_HURT = registerSoundEvent("flytrap_hurt"); - public static final DeferredHolder TRIFFID_DEATH = registerSoundEvent("triffid_death"); + public static final DeferredHolder FLYTRAP_DEATH = registerSoundEvent("flytrap_death"); - public static final DeferredHolder TRIFFID_HISS = registerSoundEvent("triffid_hiss"); + public static final DeferredHolder FLYTRAP_HISS = registerSoundEvent("flytrap_hiss"); - public static final DeferredHolder TRIFFID_GROWL = registerSoundEvent("triffid_growl"); + public static final DeferredHolder FLYTRAP_GROWL = registerSoundEvent("flytrap_growl"); public static final DeferredHolder MANTIS_AMBIENT = registerSoundEvent("mantis_ambient"); @@ -469,35 +469,35 @@ public final class AntarchyFabricSounds { public static final DeferredHolder JERRY_ADULT_ATTACK = registerSoundEvent("jerry_adult_attack"); - public static final DeferredHolder CREEPING_HORROR_GROWL = registerSoundEvent("creeping_horror_growl"); + public static final DeferredHolder CRAWLING_BLIGHT_GROWL = registerSoundEvent("crawling_blight_growl"); - public static final DeferredHolder CREEPING_HORROR_HURT = registerSoundEvent("creeping_horror_hurt"); + public static final DeferredHolder CRAWLING_BLIGHT_HURT = registerSoundEvent("crawling_blight_hurt"); - public static final DeferredHolder CREEPING_HORROR_BITE = registerSoundEvent("creeping_horror_bite"); + public static final DeferredHolder CRAWLING_BLIGHT_BITE = registerSoundEvent("crawling_blight_bite"); - public static final DeferredHolder LURKING_TERROR_SNARL = registerSoundEvent("lurking_terror_snarl"); + public static final DeferredHolder SKULKING_FRIGHT_SNARL = registerSoundEvent("skulking_fright_snarl"); - public static final DeferredHolder LURKING_TERROR_HURT = registerSoundEvent("lurking_terror_hurt"); + public static final DeferredHolder SKULKING_FRIGHT_HURT = registerSoundEvent("skulking_fright_hurt"); - public static final DeferredHolder LURKING_TERROR_BITE = registerSoundEvent("lurking_terror_bite"); + public static final DeferredHolder SKULKING_FRIGHT_BITE = registerSoundEvent("skulking_fright_bite"); - public static final DeferredHolder LURKING_TERROR_FLY_LOOP = registerSoundEvent("lurking_terror_fly_loop"); + public static final DeferredHolder SKULKING_FRIGHT_FLY_LOOP = registerSoundEvent("skulking_fright_fly_loop"); public static final DeferredHolder HERCULES_BEETLE_IDLE = registerSoundEvent("hercules_beetle_idle"); public static final DeferredHolder HERCULES_BEETLE_HURT = registerSoundEvent("hercules_beetle_hurt"); public static final DeferredHolder HERCULES_BEETLE_ATTACK = registerSoundEvent("hercules_beetle_attack"); public static final DeferredHolder HERCULES_BEETLE_CRY = registerSoundEvent("hercules_beetle_cry"); public static final DeferredHolder HERCULES_BEETLE_CHARGE_START = registerSoundEvent("hercules_beetle_charge_start"); public static final DeferredHolder HERCULES_BEETLE_KNOCKED_DOWN = registerSoundEvent("hercules_beetle_knocked_down"); - public static final DeferredHolder JUMPY_BUG_IDLE = registerSoundEvent("jumpy_bug_idle"); + public static final DeferredHolder SPRINGBUG_IDLE = registerSoundEvent("springbug_idle"); public static final DeferredHolder SPIT_BUG_IDLE = registerSoundEvent("spit_bug_idle"); - public static final DeferredHolder JUMPY_BUG_HURT = registerSoundEvent("jumpy_bug_hurt"); - public static final DeferredHolder JUMPY_BUG_JUMP = registerSoundEvent("jumpy_bug_jump"); + public static final DeferredHolder SPRINGBUG_HURT = registerSoundEvent("springbug_hurt"); + public static final DeferredHolder SPRINGBUG_JUMP = registerSoundEvent("springbug_jump"); public static final DeferredHolder SPIT_BUG_HURT = registerSoundEvent("spit_bug_hurt"); public static final DeferredHolder SPIT_BUG_SPIT = registerSoundEvent("spit_bug_spit"); public static final DeferredHolder BRUTALFLY_SPIT = registerSoundEvent("brutalfly_spit"); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSpawnPlacements.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSpawnPlacements.java index 2b9a5cd3..30b004b2 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSpawnPlacements.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSpawnPlacements.java @@ -1,6 +1,6 @@ package com.craisinlord.antarchy.fabric.registry; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import com.craisinlord.antarchy.content.entity.BedBugEntity; import com.craisinlord.antarchy.content.entity.ButterflyEntity; import com.craisinlord.antarchy.content.entity.CaterpillarEntity; @@ -8,7 +8,7 @@ import com.craisinlord.antarchy.content.entity.flying_squirrel.FlyingSquirrelEnt import com.craisinlord.antarchy.content.entity.ReverieEntity; import com.craisinlord.antarchy.content.entity.MissileSquidEntity; import com.craisinlord.antarchy.content.entity.lucid.LucidEntity; -import com.craisinlord.antarchy.content.entity.JumpyBugEntity; +import com.craisinlord.antarchy.content.entity.SpringbugEntity; import com.craisinlord.antarchy.content.entity.StinkBugEntity; import com.craisinlord.antarchy.content.entity.AlphaMantisEntity; import com.craisinlord.antarchy.content.entity.MantisEntity; @@ -42,10 +42,10 @@ public final class AntarchyFabricSpawnPlacements { SpawnPlacements.register(AntarchyFabricEntities.APPLE_COW.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Cow::checkAnimalSpawnRules); SpawnPlacements.register(AntarchyFabricEntities.GOLDEN_APPLE_COW.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Cow::checkAnimalSpawnRules); SpawnPlacements.register(AntarchyFabricEntities.ENCHANTED_GOLDEN_APPLE_COW.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Cow::checkAnimalSpawnRules); - SpawnPlacements.register(AntarchyFabricEntities.CLOUD_SHARK.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CloudSharkEntity::canSpawn); + SpawnPlacements.register(AntarchyFabricEntities.STRATOSHARK.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, StratosharkEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.WASP.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, WaspEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.BOMBER.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BomberEntity::canSpawn); - SpawnPlacements.register(AntarchyFabricEntities.JUMPY_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, JumpyBugEntity::canSpawn); + SpawnPlacements.register(AntarchyFabricEntities.SPRINGBUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, SpringbugEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.SPIT_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.SpitBugEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.KRAKEN.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, KrakenEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.MISSILE_SQUID.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MissileSquidEntity::canSpawn); @@ -69,8 +69,8 @@ public final class AntarchyFabricSpawnPlacements { SpawnPlacements.register(AntarchyFabricEntities.BASILISK.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BasiliskEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.EMPEROR_SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EmperorScorpionEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.TORETERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ToreterrorEntity::canSpawn); - SpawnPlacements.register(AntarchyFabricEntities.CREEPING_HORROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.CreepingHorrorEntity::canSpawn); - SpawnPlacements.register(AntarchyFabricEntities.LURKING_TERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.LurkingTerrorEntity::canSpawn); + SpawnPlacements.register(AntarchyFabricEntities.CRAWLING_BLIGHT.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.CrawlingBlightEntity::canSpawn); + SpawnPlacements.register(AntarchyFabricEntities.SKULKING_FRIGHT.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.SkulkingFrightEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.MANTICORE.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.ManticoreEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.JERRY.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.JerryEntity::canSpawn); SpawnPlacements.register(AntarchyFabricEntities.TERMITE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/util/JumpyBootsFabricHelper.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/util/SpringyBootsFabricHelper.java similarity index 93% rename from fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/util/JumpyBootsFabricHelper.java rename to fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/util/SpringyBootsFabricHelper.java index 5386ac41..ed38195f 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/util/JumpyBootsFabricHelper.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/util/SpringyBootsFabricHelper.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -public class JumpyBootsFabricHelper { +public class SpringyBootsFabricHelper { private static final Map PROTECTION_TIMES = new ConcurrentHashMap<>(); public static long getProtectionUntil(LivingEntity entity) { diff --git a/fabric-1.21.1/src/main/resources/antarchy-fabric.mixins.json b/fabric-1.21.1/src/main/resources/antarchy-fabric.mixins.json index bc971aaf..6def395f 100644 --- a/fabric-1.21.1/src/main/resources/antarchy-fabric.mixins.json +++ b/fabric-1.21.1/src/main/resources/antarchy-fabric.mixins.json @@ -17,7 +17,7 @@ "BloodglassEffectMixin", "BloodglassRespawnMixin", "DreamCampfireBlockEntityMixin", - "JumpyBootsFallDamageMixin", + "SpringyBootsFallDamageMixin", "entity.MultipartEntityLevelRegistryMixin", "WoodTypeInvoker", "infinity.PortalCreatorMixin", 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 573239ef..12a6bf6d 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 @@ -96,9 +96,9 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setBomberExplosionDamage(AntarchyMobsConfig.bomberExplosionDamage()); AntarchySettings.setBomberExplosionRadius(AntarchyMobsConfig.bomberExplosionRadius()); - AntarchySettings.setJumpyBugHealth(AntarchyMobsConfig.jumpyBugHealth()); - AntarchySettings.setJumpyBugPounceDamage(AntarchyMobsConfig.jumpyBugPounceDamage()); - AntarchySettings.setJumpyBugCamouflageAlpha(AntarchyMobsConfig.jumpyBugCamouflageAlpha()); + AntarchySettings.setSpringbugHealth(AntarchyMobsConfig.springbugHealth()); + AntarchySettings.setSpringbugPounceDamage(AntarchyMobsConfig.springbugPounceDamage()); + AntarchySettings.setSpringbugCamouflageAlpha(AntarchyMobsConfig.springbugCamouflageAlpha()); AntarchySettings.setEmperorScorpionHealth(AntarchyMobsConfig.emperorScorpionHealth()); AntarchySettings.setEmperorScorpionAttackDamage(AntarchyMobsConfig.emperorScorpionAttackDamage()); @@ -248,10 +248,10 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setRollyPollyArmor(AntarchyMobsConfig.rollyPollyArmor()); AntarchySettings.setRollyPollyRolledArmorBonus(AntarchyMobsConfig.rollyPollyRolledArmorBonus()); - AntarchySettings.setTriffidHealth(AntarchyMobsConfig.triffidHealth()); - AntarchySettings.setTriffidAttackDamage(AntarchyMobsConfig.triffidAttackDamage()); - AntarchySettings.setTriffidGrabDamage(AntarchyMobsConfig.triffidGrabDamage()); - AntarchySettings.setTriffidSweepHitCooldownTicks(AntarchyMobsConfig.triffidSweepHitCooldownTicks()); + AntarchySettings.setFlytrapHealth(AntarchyMobsConfig.flytrapHealth()); + AntarchySettings.setFlytrapAttackDamage(AntarchyMobsConfig.flytrapAttackDamage()); + AntarchySettings.setFlytrapGrabDamage(AntarchyMobsConfig.flytrapGrabDamage()); + AntarchySettings.setFlytrapSweepHitCooldownTicks(AntarchyMobsConfig.flytrapSweepHitCooldownTicks()); AntarchySettings.setCaterpillarPupationTimeSeconds(AntarchyMobsConfig.caterpillarPupationTimeSeconds()); @@ -343,10 +343,10 @@ public final class AntarchyConfigModuleNeoforge { AntarchySettings.setWaterBombGravity(AntarchyMobsConfig.waterBombGravity()); AntarchySettings.setWaterBombKnockback(AntarchyMobsConfig.waterBombKnockback()); - AntarchySettings.setCreepingHorrorHealth(AntarchyMobsConfig.creepingHorrorHealth()); - AntarchySettings.setCreepingHorrorAttackDamage(AntarchyMobsConfig.creepingHorrorAttackDamage()); - AntarchySettings.setLurkingTerrorHealth(AntarchyMobsConfig.lurkingTerrorHealth()); - AntarchySettings.setLurkingTerrorAttackDamage(AntarchyMobsConfig.lurkingTerrorAttackDamage()); + AntarchySettings.setCrawlingBlightHealth(AntarchyMobsConfig.crawlingBlightHealth()); + AntarchySettings.setCrawlingBlightAttackDamage(AntarchyMobsConfig.crawlingBlightAttackDamage()); + AntarchySettings.setSkulkingFrightHealth(AntarchyMobsConfig.skulkingFrightHealth()); + AntarchySettings.setSkulkingFrightAttackDamage(AntarchyMobsConfig.skulkingFrightAttackDamage()); AntarchySettings.setManticoreHealth(AntarchyMobsConfig.manticoreHealth()); AntarchySettings.setManticoreAttackDamage(AntarchyMobsConfig.manticoreAttackDamage()); AntarchySettings.setManticoreStingPoisonTicks(AntarchyMobsConfig.manticoreStingPoisonTicks()); 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 cf21481d..9733eaec 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 @@ -61,11 +61,11 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue BOMBER_EXPLOSION_RADIUS; - // Jumpy Bug + // Springbug - private static final ModConfigSpec.DoubleValue JUMPY_BUG_HEALTH; - private static final ModConfigSpec.DoubleValue JUMPY_BUG_POUNCE_DAMAGE; - private static final ModConfigSpec.DoubleValue JUMPY_BUG_CAMOUFLAGE_ALPHA; + private static final ModConfigSpec.DoubleValue SPRINGBUG_HEALTH; + private static final ModConfigSpec.DoubleValue SPRINGBUG_POUNCE_DAMAGE; + private static final ModConfigSpec.DoubleValue SPRINGBUG_CAMOUFLAGE_ALPHA; // Emperor Scorpion @@ -207,12 +207,12 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue ROLLY_POLLY_ROLLED_ARMOR_BONUS; - // Triffid + // Flytrap - private static final ModConfigSpec.DoubleValue TRIFFID_HEALTH; - private static final ModConfigSpec.DoubleValue TRIFFID_ATTACK_DAMAGE; - private static final ModConfigSpec.DoubleValue TRIFFID_GRAB_DAMAGE; - private static final ModConfigSpec.IntValue TRIFFID_SWEEP_HIT_COOLDOWN_TICKS; + private static final ModConfigSpec.DoubleValue FLYTRAP_HEALTH; + private static final ModConfigSpec.DoubleValue FLYTRAP_ATTACK_DAMAGE; + private static final ModConfigSpec.DoubleValue FLYTRAP_GRAB_DAMAGE; + private static final ModConfigSpec.IntValue FLYTRAP_SWEEP_HIT_COOLDOWN_TICKS; // Caterpillar @@ -295,16 +295,16 @@ public final class AntarchyMobsConfig { private static final ModConfigSpec.DoubleValue WATER_BOMB_KNOCKBACK; - // Creeping Horror + // Crawling Blight - private static final ModConfigSpec.DoubleValue CREEPING_HORROR_HEALTH; - private static final ModConfigSpec.DoubleValue CREEPING_HORROR_ATTACK_DAMAGE; + private static final ModConfigSpec.DoubleValue CRAWLING_BLIGHT_HEALTH; + private static final ModConfigSpec.DoubleValue CRAWLING_BLIGHT_ATTACK_DAMAGE; - // Lurking Terror + // Skulking Fright - private static final ModConfigSpec.DoubleValue LURKING_TERROR_HEALTH; - private static final ModConfigSpec.DoubleValue LURKING_TERROR_ATTACK_DAMAGE; + private static final ModConfigSpec.DoubleValue SKULKING_FRIGHT_HEALTH; + private static final ModConfigSpec.DoubleValue SKULKING_FRIGHT_ATTACK_DAMAGE; private static final ModConfigSpec.DoubleValue MANTICORE_HEALTH; private static final ModConfigSpec.DoubleValue MANTICORE_ATTACK_DAMAGE; private static final ModConfigSpec.IntValue MANTICORE_STING_POISON_TICKS; @@ -516,12 +516,12 @@ public final class AntarchyMobsConfig { b.pop(); - // Jumpy Bug + // Springbug - 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_CAMOUFLAGE_ALPHA = b.comment("Renderer alpha while camouflaged.").defineInRange("camouflageAlpha", 0.18D, 0.01D, 1.0D); + b.push("springbug"); + SPRINGBUG_HEALTH = b.comment("Base max health.").defineInRange("health", 100.0D, 1.0D, 32768.0D); + SPRINGBUG_POUNCE_DAMAGE = b.comment("Damage dealt on a successful pounce latch.").defineInRange("pounceDamage", 2.0D, 0.0D, 1024.0D); + SPRINGBUG_CAMOUFLAGE_ALPHA = b.comment("Renderer alpha while camouflaged.").defineInRange("camouflageAlpha", 0.18D, 0.01D, 1.0D); b.pop(); @@ -711,13 +711,13 @@ public final class AntarchyMobsConfig { b.pop(); - // Triffid + // Flytrap - b.push("triffid"); - TRIFFID_HEALTH = b.comment("Base max health.") .defineInRange("health", 80.0D, 1.0D, 32768.0D); - TRIFFID_ATTACK_DAMAGE = b.comment("Damage dealt by the sweep attack.") .defineInRange("attackDamage", 10.0D, 0.0D, 1024.0D); - TRIFFID_GRAB_DAMAGE = b.comment("Damage dealt by the grab attack.") .defineInRange("grabDamage", 15.0D, 0.0D, 1024.0D); - TRIFFID_SWEEP_HIT_COOLDOWN_TICKS = b + b.push("flytrap"); + FLYTRAP_HEALTH = b.comment("Base max health.") .defineInRange("health", 80.0D, 1.0D, 32768.0D); + FLYTRAP_ATTACK_DAMAGE = b.comment("Damage dealt by the sweep attack.") .defineInRange("attackDamage", 10.0D, 0.0D, 1024.0D); + FLYTRAP_GRAB_DAMAGE = b.comment("Damage dealt by the grab attack.") .defineInRange("grabDamage", 15.0D, 0.0D, 1024.0D); + FLYTRAP_SWEEP_HIT_COOLDOWN_TICKS = b .comment("Ticks a given entity is immune to repeat sweep-attack damage attempts after being hit once, so shields/armor absorbing a hit can't be shredded by every tick of the sweep's active window.") .defineInRange("sweepHitCooldownTicks", 10, 0, 200); b.pop(); @@ -863,14 +863,14 @@ public final class AntarchyMobsConfig { b.pop(); // dread - b.push("creepingHorror"); - CREEPING_HORROR_HEALTH = b.comment("Base max health.").defineInRange("health", 15.0D, 1.0D, 32768.0D); - CREEPING_HORROR_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 6.0D, 0.0D, 1024.0D); + b.push("crawlingBlight"); + CRAWLING_BLIGHT_HEALTH = b.comment("Base max health.").defineInRange("health", 15.0D, 1.0D, 32768.0D); + CRAWLING_BLIGHT_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 6.0D, 0.0D, 1024.0D); b.pop(); - b.push("lurkingTerror"); - LURKING_TERROR_HEALTH = b.comment("Base max health.").defineInRange("health", 15.0D, 1.0D, 32768.0D); - LURKING_TERROR_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 6.0D, 0.0D, 1024.0D); + b.push("skulkingFright"); + SKULKING_FRIGHT_HEALTH = b.comment("Base max health.").defineInRange("health", 15.0D, 1.0D, 32768.0D); + SKULKING_FRIGHT_ATTACK_DAMAGE = b.comment("Base attack damage.").defineInRange("attackDamage", 6.0D, 0.0D, 1024.0D); b.pop(); b.push("manticore"); @@ -984,9 +984,9 @@ public final class AntarchyMobsConfig { static double bomberExplosionDamage() { return BOMBER_EXPLOSION_DAMAGE.get(); } static double bomberExplosionRadius() { return BOMBER_EXPLOSION_RADIUS.get(); } - static double jumpyBugHealth() { return JUMPY_BUG_HEALTH.get(); } - static double jumpyBugPounceDamage() { return JUMPY_BUG_POUNCE_DAMAGE.get(); } - static double jumpyBugCamouflageAlpha() { return JUMPY_BUG_CAMOUFLAGE_ALPHA.get(); } + static double springbugHealth() { return SPRINGBUG_HEALTH.get(); } + static double springbugPounceDamage() { return SPRINGBUG_POUNCE_DAMAGE.get(); } + static double springbugCamouflageAlpha() { return SPRINGBUG_CAMOUFLAGE_ALPHA.get(); } static double emperorScorpionHealth() { return EMPEROR_SCORPION_HEALTH.get(); } static double emperorScorpionAttackDamage() { return EMPEROR_SCORPION_ATTACK_DAMAGE.get(); } @@ -1134,10 +1134,10 @@ public final class AntarchyMobsConfig { static double rollyPollyArmor() { return ROLLY_POLLY_ARMOR.get(); } static double rollyPollyRolledArmorBonus() { return ROLLY_POLLY_ROLLED_ARMOR_BONUS.get(); } - static double triffidHealth() { return TRIFFID_HEALTH.get(); } - static double triffidAttackDamage() { return TRIFFID_ATTACK_DAMAGE.get(); } - static double triffidGrabDamage() { return TRIFFID_GRAB_DAMAGE.get(); } - static int triffidSweepHitCooldownTicks() { return TRIFFID_SWEEP_HIT_COOLDOWN_TICKS.get(); } + static double flytrapHealth() { return FLYTRAP_HEALTH.get(); } + static double flytrapAttackDamage() { return FLYTRAP_ATTACK_DAMAGE.get(); } + static double flytrapGrabDamage() { return FLYTRAP_GRAB_DAMAGE.get(); } + static int flytrapSweepHitCooldownTicks() { return FLYTRAP_SWEEP_HIT_COOLDOWN_TICKS.get(); } static double caterpillarPupationTimeSeconds() { return CATERPILLAR_PUPATION_TIME_SECONDS.get(); } static double antDanceRadius() { return ANT_DANCE_RADIUS.get(); } @@ -1230,10 +1230,10 @@ public final class AntarchyMobsConfig { static double dreadHallucinationMobMinInterval() { return DREAD_HALLUCINATION_MOB_MIN_INTERVAL.get(); } static double dreadHallucinationMobMaxInterval() { return DREAD_HALLUCINATION_MOB_MAX_INTERVAL.get(); } - static double creepingHorrorHealth() { return CREEPING_HORROR_HEALTH.get(); } - static double creepingHorrorAttackDamage() { return CREEPING_HORROR_ATTACK_DAMAGE.get(); } - static double lurkingTerrorHealth() { return LURKING_TERROR_HEALTH.get(); } - static double lurkingTerrorAttackDamage() { return LURKING_TERROR_ATTACK_DAMAGE.get(); } + static double crawlingBlightHealth() { return CRAWLING_BLIGHT_HEALTH.get(); } + static double crawlingBlightAttackDamage() { return CRAWLING_BLIGHT_ATTACK_DAMAGE.get(); } + static double skulkingFrightHealth() { return SKULKING_FRIGHT_HEALTH.get(); } + static double skulkingFrightAttackDamage() { return SKULKING_FRIGHT_ATTACK_DAMAGE.get(); } static double manticoreHealth() { return MANTICORE_HEALTH.get(); } static double manticoreAttackDamage() { return MANTICORE_ATTACK_DAMAGE.get(); } static int manticoreStingPoisonTicks() { return MANTICORE_STING_POISON_TICKS.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 f7abd906..082f6e29 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 @@ -46,11 +46,11 @@ public class AntarchyNeoforge { AntarchyNeoforgeSounds.ANT_BITE, AntarchyNeoforgeSounds.ANT_GATHER, AntarchyNeoforgeSounds.ANT_NEST, - AntarchyNeoforgeSounds.CLOUD_SHARK_BITE, - AntarchyNeoforgeSounds.CLOUD_SHARK_IDLE, - AntarchyNeoforgeSounds.CLOUD_SHARK_HURT, - AntarchyNeoforgeSounds.CLOUD_SHARK_DEATH, - AntarchyNeoforgeSounds.CLOUD_SHARK_FLY, + AntarchyNeoforgeSounds.STRATOSHARK_BITE, + AntarchyNeoforgeSounds.STRATOSHARK_IDLE, + AntarchyNeoforgeSounds.STRATOSHARK_HURT, + AntarchyNeoforgeSounds.STRATOSHARK_DEATH, + AntarchyNeoforgeSounds.STRATOSHARK_FLY, AntarchyNeoforgeSounds.CATERPILLAR_IDLE, AntarchyNeoforgeSounds.CATERPILLAR_HURT, AntarchyNeoforgeSounds.CATERPILLAR_CRAWL, @@ -110,12 +110,12 @@ public class AntarchyNeoforge { AntarchyNeoforgeSounds.NIGHTMARE_DEATH, AntarchyNeoforgeSounds.NIGHTMARE_BITE, AntarchyNeoforgeSounds.NIGHTMARE_FLAP, - AntarchyNeoforgeSounds.TRIFFID_ATTACK, - AntarchyNeoforgeSounds.TRIFFID_GRAB, - AntarchyNeoforgeSounds.TRIFFID_HURT, - AntarchyNeoforgeSounds.TRIFFID_DEATH, - AntarchyNeoforgeSounds.TRIFFID_HISS, - AntarchyNeoforgeSounds.TRIFFID_GROWL, + AntarchyNeoforgeSounds.FLYTRAP_ATTACK, + AntarchyNeoforgeSounds.FLYTRAP_GRAB, + AntarchyNeoforgeSounds.FLYTRAP_HURT, + AntarchyNeoforgeSounds.FLYTRAP_DEATH, + AntarchyNeoforgeSounds.FLYTRAP_HISS, + AntarchyNeoforgeSounds.FLYTRAP_GROWL, AntarchyNeoforgeSounds.MANTIS_AMBIENT, AntarchyNeoforgeSounds.MANTIS_HURT, AntarchyNeoforgeSounds.MANTIS_ATTACK, @@ -164,13 +164,13 @@ public class AntarchyNeoforge { AntarchyNeoforgeSounds.STINK_BUG_IDLE, AntarchyNeoforgeSounds.CAVARYN_HEARTBEAT, AntarchyNeoforgeSounds.ROLLY_POLLY_IDLE, - AntarchyNeoforgeSounds.CREEPING_HORROR_GROWL, - AntarchyNeoforgeSounds.CREEPING_HORROR_HURT, - AntarchyNeoforgeSounds.CREEPING_HORROR_BITE, - AntarchyNeoforgeSounds.LURKING_TERROR_SNARL, - AntarchyNeoforgeSounds.LURKING_TERROR_HURT, - AntarchyNeoforgeSounds.LURKING_TERROR_BITE, - AntarchyNeoforgeSounds.LURKING_TERROR_FLY_LOOP, + AntarchyNeoforgeSounds.CRAWLING_BLIGHT_GROWL, + AntarchyNeoforgeSounds.CRAWLING_BLIGHT_HURT, + AntarchyNeoforgeSounds.CRAWLING_BLIGHT_BITE, + AntarchyNeoforgeSounds.SKULKING_FRIGHT_SNARL, + AntarchyNeoforgeSounds.SKULKING_FRIGHT_HURT, + AntarchyNeoforgeSounds.SKULKING_FRIGHT_BITE, + AntarchyNeoforgeSounds.SKULKING_FRIGHT_FLY_LOOP, AntarchyNeoforgeSounds.DUCT_TAPE_USE, AntarchyNeoforgeSounds.HERCULES_BEETLE_IDLE, AntarchyNeoforgeSounds.HERCULES_BEETLE_HURT, @@ -178,10 +178,10 @@ public class AntarchyNeoforge { AntarchyNeoforgeSounds.HERCULES_BEETLE_CRY, AntarchyNeoforgeSounds.HERCULES_BEETLE_CHARGE_START, AntarchyNeoforgeSounds.HERCULES_BEETLE_KNOCKED_DOWN, - AntarchyNeoforgeSounds.JUMPY_BUG_IDLE, + AntarchyNeoforgeSounds.SPRINGBUG_IDLE, AntarchyNeoforgeSounds.SPIT_BUG_IDLE, - AntarchyNeoforgeSounds.JUMPY_BUG_HURT, - AntarchyNeoforgeSounds.JUMPY_BUG_JUMP, + AntarchyNeoforgeSounds.SPRINGBUG_HURT, + AntarchyNeoforgeSounds.SPRINGBUG_JUMP, AntarchyNeoforgeSounds.SPIT_BUG_HURT, AntarchyNeoforgeSounds.SPIT_BUG_SPIT, AntarchyNeoforgeSounds.BRUTALFLY_SPIT, @@ -334,14 +334,14 @@ public class AntarchyNeoforge { AntarchyNeoforgeEntites.CATERPILLAR, AntarchyNeoforgeEntites.BUTTERFLY, AntarchyNeoforgeEntites.REVERIE, - AntarchyNeoforgeEntites.TRIFFID, + AntarchyNeoforgeEntites.FLYTRAP, AntarchyNeoforgeEntites.BRUTALFLY, AntarchyNeoforgeEntites.BRUTALFLY_ORB, AntarchyNeoforgeEntites.HUSH_PROJECTILE, AntarchyNeoforgeEntites.TORETERROR, AntarchyNeoforgeEntites.WATER_BOMB, - AntarchyNeoforgeEntites.CREEPING_HORROR, - AntarchyNeoforgeEntites.LURKING_TERROR, + AntarchyNeoforgeEntites.CRAWLING_BLIGHT, + AntarchyNeoforgeEntites.SKULKING_FRIGHT, AntarchyNeoforgeEntites.STINK_BUG, AntarchyNeoforgeEntites.CHEEP, AntarchyNeoforgeEntites.DORRIE, @@ -370,7 +370,7 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_SLAB.get(), () -> AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_WALL.get(), () -> AntarchyNeoforgeBlocks.CLOUD_BLOCK.get(), - () -> AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), + () -> AntarchyNeoforgeBlocks.FLYTRAP_GOO_BLOCK.get(), () -> AntarchyNeoforgeBlocks.PALE_NYXITE.get(), () -> AntarchyNeoforgeBlocks.NYXITE_SPIKE.get(), () -> AntarchyNeoforgeBlocks.CHITIN_BLOCK.get(), @@ -402,8 +402,8 @@ public class AntarchyNeoforge { () -> AntarchyNeoforgeBlocks.ORANGE_MILKWEED.get(), () -> AntarchyNeoforgeBlocks.PINK_MILKWEED.get(), () -> AntarchyNeoforgeBlocks.BED_BUG_EGG.get(), - () -> AntarchyNeoforgeBlocks.CREEPING_HORROR_EGG.get(), - () -> AntarchyNeoforgeBlocks.LURKING_TERROR_EGG.get(), + () -> AntarchyNeoforgeBlocks.CRAWLING_BLIGHT_EGG.get(), + () -> AntarchyNeoforgeBlocks.SKULKING_FRIGHT_EGG.get(), () -> AntarchyNeoforgeBlocks.WASP_NEST.get(), () -> AntarchyNeoforgeBlocks.HUSHWEED.get(), () -> AntarchyNeoforgeBlocks.OURANWOOD_SQUIRREL_NEST.get(), diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforgeEvents.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforgeEvents.java index 15cd485d..7b61efb8 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforgeEvents.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforgeEvents.java @@ -5,6 +5,7 @@ import com.craisinlord.antarchy.content.command.CavarynCommand; import com.craisinlord.antarchy.content.command.CaterpillarCommand; import com.craisinlord.antarchy.content.command.DimensionalTearCommand; import com.craisinlord.antarchy.content.command.GravityCommand; +import com.craisinlord.antarchy.content.command.QueenLocateCommand; import com.craisinlord.antarchy.content.command.RoyalCommand; import com.craisinlord.antarchy.content.time.TimeDilationCommand; import net.neoforged.bus.api.SubscribeEvent; @@ -22,6 +23,7 @@ public final class AntarchyNeoforgeEvents { GravityCommand.register(event.getDispatcher()); CaterpillarCommand.register(event.getDispatcher()); DimensionalTearCommand.register(event.getDispatcher()); + QueenLocateCommand.register(event.getDispatcher()); TimeDilationCommand.register(event.getDispatcher()); RoyalCommand.register(event.getDispatcher()); } 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 97a333c4..0c39aa47 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 @@ -24,6 +24,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.client.resources.PlayerSkin; import net.minecraft.client.renderer.entity.ThrownItemRenderer; +import net.minecraft.client.renderer.blockentity.VaultRenderer; +import com.craisinlord.antarchy.content.client.renderer.UnderVaultRenderer; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -95,6 +97,8 @@ public final class AntarchyNeoForgeClient { event.registerBlockEntityRenderer(AntarchyNeoforgeBlocks.SEASHELL_BLOCK_ENTITY.get(), SeashellRenderer::new); event.registerBlockEntityRenderer(AntarchyNeoforgeBlocks.LUCID_ANCHOR_BLOCK_ENTITY.get(), LucidAnchorBlockEntityRenderer::new); event.registerBlockEntityRenderer(AntarchyNeoforgeBlocks.CRITTER_CAGE_BLOCK_ENTITY.get(), CritterCageRenderer::new); + event.registerBlockEntityRenderer(AntarchyNeoforgeBlocks.UNDERTRIAL_SPAWNER_BLOCK_ENTITY.get(), UndertrialSpawnerRenderer::new); + event.registerBlockEntityRenderer(AntarchyNeoforgeBlocks.UNDERVAULT_BLOCK_ENTITY.get(), UnderVaultRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.EASTER_BUNNY.get(), context -> withParalyzedGeoLayer(new EasterBunnyRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.FLYING_SQUIRREL.get(), context -> withParalyzedGeoLayer(new FlyingSquirrelRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.CATERPILLAR.get(), context -> withParalyzedGeoLayer(new CaterpillarRenderer(context))); @@ -110,7 +114,7 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.ALPHA_MANTIS.get(), context -> withParalyzedGeoLayer(new AlphaMantisRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.HOVERBOARD.get(), com.craisinlord.antarchy.content.client.renderer.HoverboardRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.MOLEVORE.get(), context -> withParalyzedGeoLayer(new MolevoreRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.TRIFFID.get(), context -> withParalyzedGeoLayer(new TriffidRenderer(context))); + event.registerEntityRenderer(AntarchyNeoforgeEntites.FLYTRAP.get(), context -> withParalyzedGeoLayer(new FlytrapRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.OURANWOOD_BOAT_ENTITY.get(), context -> new OuranwoodBoatRenderer<>(context, OURANWOOD_BOAT_TEXTURE, false)); 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)); @@ -124,7 +128,7 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.ENCHANTED_GOLDEN_APPLE_COW.get(), context -> withParalyzedGeoLayer(new AppleCowRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.DIAMOND_MINECART.get(), DiamondMinecartRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.DR_TRAYAURUS.get(), context -> new DrTrayaurusRenderer(context, DR_TRAYAURUS_TEXTURE)); - event.registerEntityRenderer(AntarchyNeoforgeEntites.CLOUD_SHARK.get(), context -> withParalyzedGeoLayer(new CloudSharkRenderer(context))); + event.registerEntityRenderer(AntarchyNeoforgeEntites.STRATOSHARK.get(), context -> withParalyzedGeoLayer(new StratosharkRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.KRAKEN.get(), context -> withParalyzedGeoLayer(new KrakenRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.TENTACLE.get(), com.craisinlord.antarchy.content.client.renderer.TentacleRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.KRAKENS_GRASP_TRIDENT.get(), com.craisinlord.antarchy.content.client.renderer.KrakensGraspThrownTridentRenderer::new); @@ -168,8 +172,8 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.ELKA.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.ElkaRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.ROLLY_POLLY.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.RollyPollyRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.TERMITE.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.TermiteRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.CreepingHorrorRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.LURKING_TERROR.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.LurkingTerrorRenderer(context))); + event.registerEntityRenderer(AntarchyNeoforgeEntites.CRAWLING_BLIGHT.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.CrawlingBlightRenderer(context))); + event.registerEntityRenderer(AntarchyNeoforgeEntites.SKULKING_FRIGHT.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.SkulkingFrightRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.MANTICORE.get(), com.craisinlord.antarchy.content.client.renderer.ManticoreRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.HERCULES_BEETLE.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.HerculesBeetleRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.PRINCE.get(), com.craisinlord.antarchy.content.client.renderer.RoyalMountRenderer::new); @@ -180,7 +184,7 @@ public final class AntarchyNeoForgeClient { event.registerEntityRenderer(AntarchyNeoforgeEntites.ROYAL_ELEMENTAL_PROJECTILE.get(), com.craisinlord.antarchy.content.client.renderer.RoyalElementalProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.ROYAL_ICE_SPIKE.get(), com.craisinlord.antarchy.content.client.renderer.RoyalIceSpikeRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.JERRY.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.JerryRenderer(context))); - event.registerEntityRenderer(AntarchyNeoforgeEntites.JUMPY_BUG.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.JumpyBugRenderer(context))); + event.registerEntityRenderer(AntarchyNeoforgeEntites.SPRINGBUG.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.SpringbugRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.SPIT_BUG.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.SpitBugRenderer(context))); event.registerEntityRenderer(AntarchyNeoforgeEntites.SPIT_BUG_PROJECTILE.get(), com.craisinlord.antarchy.content.client.renderer.SpitBugProjectileRenderer::new); event.registerEntityRenderer(AntarchyNeoforgeEntites.STINK_BUG.get(), context -> withParalyzedGeoLayer(new com.craisinlord.antarchy.content.client.renderer.StinkBugRenderer(context))); @@ -331,6 +335,9 @@ public final class AntarchyNeoForgeClient { event.registerSpriteSet(AntarchyNeoforgeMisc.ORANGE_ASH.get(), OrangeAshParticle.Provider::new); event.registerSpriteSet(AntarchyNeoforgeMisc.LUCID_BOLT_IMPACT_SMALL.get(), LucidBoltImpactParticle.SmallProvider::new); event.registerSpriteSet(AntarchyNeoforgeMisc.LUCID_BOLT_IMPACT_LARGE.get(), LucidBoltImpactParticle.LargeProvider::new); + event.registerSpriteSet(AntarchyNeoforgeMisc.UNDERTRIAL_SPAWNER_DETECTION.get(), UndertrialParticle.DetectionProvider::new); + event.registerSpriteSet(AntarchyNeoforgeMisc.UNDERTRIAL_OMEN.get(), UndertrialParticle.OmenProvider::new); + event.registerSpriteSet(AntarchyNeoforgeMisc.UNDERVAULT_CONNECTION.get(), UndertrialParticle.OmenProvider::new); } @SubscribeEvent @@ -371,12 +378,12 @@ public final class AntarchyNeoForgeClient { (guiGraphics, partialTick) -> BloodglassHudRenderer.render(guiGraphics) ); event.registerAboveAll( - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "triffid_goo"), - (guiGraphics, partialTick) -> TriffidGooHudRenderer.render(guiGraphics) + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "flytrap_goo"), + (guiGraphics, partialTick) -> FlytrapGooHudRenderer.render(guiGraphics) ); event.registerAboveAll( - ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "jumpy_boots"), - (guiGraphics, partialTick) -> JumpyBootsHudRenderer.render(guiGraphics) + ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "springy_boots"), + (guiGraphics, partialTick) -> SpringyBootsHudRenderer.render(guiGraphics) ); event.registerAboveAll( ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "dorrie_jump"), @@ -591,6 +598,8 @@ public final class AntarchyNeoForgeClient { public static void onClientSetup(FMLClientSetupEvent event) { event.enqueueWork(() -> { TigerEyeClientHooks.setCamouflageKeyTextSupplier(() -> AntarchyKeyBindings.TIGERS_EYE_CAMOUFLAGE.getTranslatedKeyMessage()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.UNDERTRIAL_SPAWNER.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.UNDERVAULT.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ANTIMETAL_RAIL.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ANTIMETAL_POWERED_RAIL.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ANTIMETAL_DETECTOR_RAIL.get(), RenderType.cutout()); @@ -678,7 +687,7 @@ public final class AntarchyNeoForgeClient { ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.LUCID_ANCHOR.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.ELYTHIA_PORTAL.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.THORAXIS_PORTAL.get(), RenderType.translucent()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.FLYTRAP_GOO_BLOCK.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.VORTEX_LENS.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.URANIUM_DOOR.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.TITANIUM_DOOR.get(), RenderType.cutout()); @@ -687,7 +696,7 @@ public final class AntarchyNeoForgeClient { ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.URANIUM_BARS.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.TITANIUM_BARS.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CLOUD_BLOCK.get(), RenderType.translucent()); - ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.JUMPY_BUG_EGG.get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.SPRINGBUG_EGG.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.SPIT_BUG_EGG.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.JERRY_EGG.get(), RenderType.translucent()); ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.BIOWART_TENDRILS.get(), RenderType.cutout()); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/TriffidGooHudRenderer.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/FlytrapGooHudRenderer.java similarity index 91% rename from neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/TriffidGooHudRenderer.java rename to neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/FlytrapGooHudRenderer.java index d76a9984..faaffd88 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/TriffidGooHudRenderer.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/FlytrapGooHudRenderer.java @@ -8,8 +8,8 @@ import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Block; -public final class TriffidGooHudRenderer { - private TriffidGooHudRenderer() { +public final class FlytrapGooHudRenderer { + private FlytrapGooHudRenderer() { } private static float fadeProgress = 0f; private static final float FADE_SPEED = 0.05f; @@ -22,7 +22,7 @@ public final class TriffidGooHudRenderer { fadeProgress = Math.max(0f, fadeProgress - FADE_SPEED); if (fadeProgress <= 0f) return; } else { - Block goo = AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(); + Block goo = AntarchyNeoforgeBlocks.FLYTRAP_GOO_BLOCK.get(); BlockPos feet = player.blockPosition(); boolean inGoo = player.level().getBlockState(feet).is(goo) || player.level().getBlockState(feet.above()).is(goo); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/JumpyBootsClientHandler.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/SpringyBootsClientHandler.java similarity index 75% rename from neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/JumpyBootsClientHandler.java rename to neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/SpringyBootsClientHandler.java index be7d4a50..4ec36153 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/JumpyBootsClientHandler.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/SpringyBootsClientHandler.java @@ -1,9 +1,9 @@ package com.craisinlord.antarchy.neoforge.client; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.item.JumpyBootsHelper; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; -import com.craisinlord.antarchy.content.network.JumpyBootsLaunchPayload; +import com.craisinlord.antarchy.content.item.SpringyBootsHelper; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; +import com.craisinlord.antarchy.content.network.SpringyBootsLaunchPayload; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.neoforged.api.distmarker.Dist; @@ -15,13 +15,13 @@ import net.neoforged.neoforge.client.gui.VanillaGuiLayers; import net.neoforged.neoforge.network.PacketDistributor; @EventBusSubscriber(modid = Antarchy.MODID, value = Dist.CLIENT) -public final class JumpyBootsClientHandler { +public final class SpringyBootsClientHandler { private static int chargeTicks = 0; private static boolean wasCharging = false; private static int primeWindowTicks = 0; private static int storedChargeTicks = 0; - private JumpyBootsClientHandler() { + private SpringyBootsClientHandler() { } @SubscribeEvent @@ -34,7 +34,7 @@ public final class JumpyBootsClientHandler { return; } - if (!JumpyBootsItem.isWearingJumpyBoots(player)) { + if (!SpringyBootsItem.isWearingSpringyBoots(player)) { reset(); return; } @@ -46,7 +46,7 @@ public final class JumpyBootsClientHandler { if (primeWindowTicks > 0) { primeWindowTicks--; if (jumpPressed) { - PacketDistributor.sendToServer(new JumpyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); + PacketDistributor.sendToServer(new SpringyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); reset(); return; } @@ -63,22 +63,22 @@ public final class JumpyBootsClientHandler { } if (jumpPressed && wasCharging && chargeTicks > 0) { - PacketDistributor.sendToServer(new JumpyBootsLaunchPayload(chargeTicks, player.isSprinting())); + PacketDistributor.sendToServer(new SpringyBootsLaunchPayload(chargeTicks, player.isSprinting())); reset(); return; } if (sneaking) { - chargeTicks = Math.min(chargeTicks + 1, JumpyBootsHelper.CHARGE_TICKS_MAX); + chargeTicks = Math.min(chargeTicks + 1, SpringyBootsHelper.CHARGE_TICKS_MAX); wasCharging = true; } else if (wasCharging && chargeTicks > 0) { storedChargeTicks = chargeTicks; if (jumpPressed) { - PacketDistributor.sendToServer(new JumpyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); + PacketDistributor.sendToServer(new SpringyBootsLaunchPayload(storedChargeTicks, player.isSprinting())); reset(); return; } - primeWindowTicks = JumpyBootsHelper.PRIME_WINDOW_TICKS; + primeWindowTicks = SpringyBootsHelper.PRIME_WINDOW_TICKS; chargeTicks = 0; wasCharging = false; } else { @@ -97,7 +97,7 @@ public final class JumpyBootsClientHandler { @SubscribeEvent public static void onRenderGuiLayer(RenderGuiLayerEvent.Pre event) { Minecraft mc = Minecraft.getInstance(); - if (mc.player == null || !JumpyBootsItem.isWearingJumpyBoots(mc.player) || !isCharging()) { + if (mc.player == null || !SpringyBootsItem.isWearingSpringyBoots(mc.player) || !isCharging()) { return; } if (event.getName().equals(VanillaGuiLayers.EXPERIENCE_BAR) || event.getName().equals(VanillaGuiLayers.EXPERIENCE_LEVEL)) { diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/JumpyBootsHudRenderer.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/SpringyBootsHudRenderer.java similarity index 76% rename from neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/JumpyBootsHudRenderer.java rename to neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/SpringyBootsHudRenderer.java index 6dd6a0b5..1ffb5128 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/JumpyBootsHudRenderer.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/SpringyBootsHudRenderer.java @@ -1,20 +1,20 @@ package com.craisinlord.antarchy.neoforge.client; -import com.craisinlord.antarchy.content.item.JumpyBootsHelper; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; +import com.craisinlord.antarchy.content.item.SpringyBootsHelper; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; -public final class JumpyBootsHudRenderer { +public final class SpringyBootsHudRenderer { private static final ResourceLocation JUMP_BAR_BACKGROUND = ResourceLocation.withDefaultNamespace("textures/gui/sprites/hud/jump_bar_background.png"); private static final ResourceLocation JUMP_BAR_PROGRESS = ResourceLocation.withDefaultNamespace("textures/gui/sprites/hud/jump_bar_progress.png"); private static final int BAR_WIDTH = 182; private static final int BAR_HEIGHT = 5; - private JumpyBootsHudRenderer() { + private SpringyBootsHudRenderer() { } public static void render(GuiGraphics guiGraphics) { @@ -23,10 +23,10 @@ public final class JumpyBootsHudRenderer { if (player == null || mc.screen != null || player.isDeadOrDying()) { return; } - if (!JumpyBootsItem.isWearingJumpyBoots(player)) { + if (!SpringyBootsItem.isWearingSpringyBoots(player)) { return; } - if (!JumpyBootsClientHandler.isCharging()) { + if (!SpringyBootsClientHandler.isCharging()) { return; } @@ -37,8 +37,8 @@ public final class JumpyBootsHudRenderer { guiGraphics.blit(JUMP_BAR_BACKGROUND, x0, y0, 0, 0, BAR_WIDTH, BAR_HEIGHT, BAR_WIDTH, BAR_HEIGHT); - int chargeTicks = JumpyBootsClientHandler.getChargeTicks(); - float chargeRatio = Mth.clamp(chargeTicks / (float) JumpyBootsHelper.CHARGE_TICKS_MAX, 0.0F, 1.0F); + int chargeTicks = SpringyBootsClientHandler.getChargeTicks(); + float chargeRatio = Mth.clamp(chargeTicks / (float) SpringyBootsHelper.CHARGE_TICKS_MAX, 0.0F, 1.0F); int filledWidth = Mth.clamp((int) (chargeRatio * BAR_WIDTH), 0, BAR_WIDTH); if (filledWidth > 0) { guiGraphics.setColor(1.0F, 1.0F, 1.0F, 0.35F + chargeRatio * 0.65F); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/network/JumpyBootsNetworking.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/network/SpringyBootsNetworking.java similarity index 65% rename from neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/network/JumpyBootsNetworking.java rename to neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/network/SpringyBootsNetworking.java index 27e48599..1e68bc09 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/network/JumpyBootsNetworking.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/network/SpringyBootsNetworking.java @@ -1,9 +1,9 @@ package com.craisinlord.antarchy.neoforge.network; import com.craisinlord.antarchy.Antarchy; -import com.craisinlord.antarchy.content.item.JumpyBootsHelper; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; -import com.craisinlord.antarchy.content.network.JumpyBootsLaunchPayload; +import com.craisinlord.antarchy.content.item.SpringyBootsHelper; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; +import com.craisinlord.antarchy.content.network.SpringyBootsLaunchPayload; import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; @@ -18,31 +18,31 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import net.neoforged.neoforge.network.registration.PayloadRegistrar; @EventBusSubscriber(modid = Antarchy.MODID) -public final class JumpyBootsNetworking { - private JumpyBootsNetworking() { +public final class SpringyBootsNetworking { + private SpringyBootsNetworking() { } public static void register(PayloadRegistrar registrar) { registrar.playToServer( - JumpyBootsLaunchPayload.TYPE, - JumpyBootsLaunchPayload.STREAM_CODEC, - JumpyBootsNetworking::handleLaunch + SpringyBootsLaunchPayload.TYPE, + SpringyBootsLaunchPayload.STREAM_CODEC, + SpringyBootsNetworking::handleLaunch ); } - private static void handleLaunch(JumpyBootsLaunchPayload payload, IPayloadContext context) { + private static void handleLaunch(SpringyBootsLaunchPayload payload, IPayloadContext context) { context.enqueueWork(() -> { if (!(context.player() instanceof ServerPlayer player)) return; - if (!JumpyBootsItem.isWearingJumpyBoots(player)) return; + if (!SpringyBootsItem.isWearingSpringyBoots(player)) return; if (player.isSpectator() || player.isPassenger()) return; ItemStack boots = player.getItemBySlot(EquipmentSlot.FEET); if (player.getCooldowns().isOnCooldown(boots.getItem())) return; - int clampedCharge = Math.min(payload.chargeTicks(), JumpyBootsHelper.CHARGE_TICKS_MAX); + int clampedCharge = Math.min(payload.chargeTicks(), SpringyBootsHelper.CHARGE_TICKS_MAX); if (clampedCharge <= 0) return; - float verticalBoost = JumpyBootsHelper.verticalBoostFor(clampedCharge); + float verticalBoost = SpringyBootsHelper.verticalBoostFor(clampedCharge); Vec3 current = player.getDeltaMovement(); double newY = verticalBoost; @@ -51,8 +51,8 @@ public final class JumpyBootsNetworking { if (payload.sprinting()) { Vec3 look = player.getLookAngle(); - newX += look.x * JumpyBootsHelper.SPRINT_FORWARD_BOOST; - newZ += look.z * JumpyBootsHelper.SPRINT_FORWARD_BOOST; + newX += look.x * SpringyBootsHelper.SPRINT_FORWARD_BOOST; + newZ += look.z * SpringyBootsHelper.SPRINT_FORWARD_BOOST; } player.setDeltaMovement(newX, newY, newZ); @@ -62,19 +62,19 @@ public final class JumpyBootsNetworking { player.resetFallDistance(); player.connection.send(new ClientboundSetEntityMotionPacket(player)); - player.level().playSound(null, player.blockPosition(), SoundEvents.SLIME_JUMP, SoundSource.PLAYERS, 1.0F, 0.6F + (clampedCharge / (float) JumpyBootsHelper.CHARGE_TICKS_MAX) * 0.6F); + player.level().playSound(null, player.blockPosition(), SoundEvents.SLIME_JUMP, SoundSource.PLAYERS, 1.0F, 0.6F + (clampedCharge / (float) SpringyBootsHelper.CHARGE_TICKS_MAX) * 0.6F); - player.getPersistentData().putLong(JumpyBootsHelper.FALL_PROTECTION_NBT_KEY, player.level().getGameTime() + JumpyBootsHelper.FALL_PROTECTION_TICKS); + player.getPersistentData().putLong(SpringyBootsHelper.FALL_PROTECTION_NBT_KEY, player.level().getGameTime() + SpringyBootsHelper.FALL_PROTECTION_TICKS); - player.getCooldowns().addCooldown(boots.getItem(), JumpyBootsHelper.COOLDOWN_TICKS); + player.getCooldowns().addCooldown(boots.getItem(), SpringyBootsHelper.COOLDOWN_TICKS); }); } @SubscribeEvent public static void onLivingFall(LivingFallEvent event) { if (!(event.getEntity() instanceof ServerPlayer player)) return; - if (!JumpyBootsItem.isWearingJumpyBoots(player)) return; - long protectionUntil = player.getPersistentData().getLong(JumpyBootsHelper.FALL_PROTECTION_NBT_KEY); + if (!SpringyBootsItem.isWearingSpringyBoots(player)) return; + long protectionUntil = player.getPersistentData().getLong(SpringyBootsHelper.FALL_PROTECTION_NBT_KEY); if (player.level().getGameTime() < protectionUntil) { event.setDamageMultiplier(event.getDamageMultiplier() * 0.25F); } 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 43ad4a76..d260c3ec 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 @@ -399,6 +399,7 @@ public final class AntarchyNeoForgeEvents { static void handleTigerEyeRespawn(PlayerEvent.PlayerRespawnEvent event) { if (event.getEntity() instanceof ServerPlayer player) { + com.craisinlord.antarchy.content.time.ChronosphereManager.refresh(player); TigerEyeCamouflageController.deactivate(player, false); TigerEyeCamouflageSync.sync(player); } @@ -406,12 +407,14 @@ public final class AntarchyNeoForgeEvents { static void handleTigerEyeLogin(PlayerEvent.PlayerLoggedInEvent event) { if (event.getEntity() instanceof ServerPlayer player) { + com.craisinlord.antarchy.content.time.ChronosphereManager.refresh(player); TigerEyeCamouflageSync.sync(player); } } static void handleTigerEyeDimensionChange(PlayerEvent.PlayerChangedDimensionEvent event) { if (event.getEntity() instanceof ServerPlayer player) { + com.craisinlord.antarchy.content.time.ChronosphereManager.refresh(player); TigerEyeCamouflageController.deactivate(player, false); TigerEyeCamouflageSync.sync(player); } @@ -873,8 +876,7 @@ public final class AntarchyNeoForgeEvents { static void handleBloodCrystalBootsFall(LivingFallEvent event) { if (!(event.getEntity() instanceof Player player)) return; if (!com.craisinlord.antarchy.content.gravity.AntarchyGravityApi.isGravityInverted(player)) return; - if (!(player.getItemBySlot(net.minecraft.world.entity.EquipmentSlot.FEET).getItem() instanceof BloodCrystalArmorItem) - && !com.craisinlord.antarchy.content.item.royal.RoyalGearHelper.hasUpwardFallImmunityBoots(player)) return; + if (com.craisinlord.antarchy.content.enchantment.AntarchyEnchantments.featherRisingLevel(player) <= 0) return; event.setCanceled(true); } @@ -1264,8 +1266,8 @@ public final class AntarchyNeoForgeEvents { event.getBuilder().addMix(AntarchyNeoforgeMisc.PARALYSIS, Items.REDSTONE, AntarchyNeoforgeMisc.LONG_PARALYSIS); event.getBuilder().addMix(Potions.AWKWARD, AntarchyNeoforgeItems.MOLEWORM_ITEM.get(), AntarchyNeoforgeMisc.HASTE); event.getBuilder().addMix(AntarchyNeoforgeMisc.HASTE, Items.GLOWSTONE_DUST, AntarchyNeoforgeMisc.STRONG_HASTE); - event.getBuilder().addMix(Potions.AWKWARD, AntarchyNeoforgeItems.CLOUD_SHARK_FIN.get(), Potions.SLOW_FALLING); - event.getBuilder().addMix(Potions.AWKWARD, AntarchyNeoforgeItems.JUMPY_BUG_LEG.get(), Potions.LEAPING); + event.getBuilder().addMix(Potions.AWKWARD, AntarchyNeoforgeItems.STRATOSHARK_FIN.get(), Potions.SLOW_FALLING); + event.getBuilder().addMix(Potions.AWKWARD, AntarchyNeoforgeItems.SPRINGBUG_LEG.get(), Potions.LEAPING); event.getBuilder().addMix(Potions.AWKWARD, AntarchyNeoforgeItems.CORNEA_EAR.get(), Potions.NIGHT_VISION); event.getBuilder().addMix(Potions.AWKWARD, AntarchyNeoforgeItems.URANIUM_NUGGET.get(), AntarchyNeoforgeMisc.SHRINKING); event.getBuilder().addMix(AntarchyNeoforgeMisc.SHRINKING, Items.GLOWSTONE_DUST, AntarchyNeoforgeMisc.STRONG_SHRINKING); 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 87b243e5..9130ed3b 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 @@ -13,8 +13,11 @@ import com.craisinlord.antarchy.content.block.entity.LucidAnchorBlockEntity; import com.craisinlord.antarchy.content.block.entity.PortalGunPortalBaseBlockEntity; import com.craisinlord.antarchy.content.block.entity.PortalGunPortalMasterBlockEntity; import com.craisinlord.antarchy.content.block.entity.PotentNyxiteBlockEntity; +import com.craisinlord.antarchy.content.block.entity.QueenTrailSpawnMarkerBlockEntity; import com.craisinlord.antarchy.content.block.entity.SeashellBlockEntity; import com.craisinlord.antarchy.content.block.entity.UpperBlockEntity; +import com.craisinlord.antarchy.content.block.entity.UndertrialSpawnerBlockEntity; +import com.craisinlord.antarchy.content.block.entity.UnderVaultBlockEntity; import com.craisinlord.antarchy.content.block.entity.VortexLensBlockEntity; import com.craisinlord.antarchy.content.block.entity.WaspNestBlockEntity; import com.craisinlord.antarchy.content.fluid.BileLiquidBlock; @@ -48,6 +51,15 @@ import net.neoforged.neoforge.registries.DeferredRegister; public final class AntarchyNeoforgeBlocks { private static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(Antarchy.MODID); private static final DeferredRegister> BLOCK_ENTITY_TYPES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, Antarchy.MODID); + public static final DeferredBlock UNDERTRIAL_SPAWNER = BLOCKS.register("undertrial_spawner", + () -> new UndertrialSpawnerBlock(AntarchyNeoforgeBlocks::undertrialSpawnerBlockEntityType, + BlockBehaviour.Properties.ofFullCopy(Blocks.TRIAL_SPAWNER).noOcclusion().isViewBlocking((state, level, pos) -> false))); + public static final DeferredBlock UNDERVAULT = BLOCKS.register("undervault", + () -> new UnderVaultBlock(AntarchyNeoforgeBlocks::underVaultBlockEntityType, + BlockBehaviour.Properties.ofFullCopy(Blocks.VAULT).noOcclusion().isViewBlocking((state, level, pos) -> false))); + public static final DeferredBlock QUEEN_TRAIL_SPAWN_MARKER = BLOCKS.register("queen_trail_spawn_marker", + () -> new QueenTrailSpawnMarkerBlock(AntarchyNeoforgeBlocks::queenTrailSpawnMarkerBlockEntityType, + BlockBehaviour.Properties.ofFullCopy(Blocks.BEDROCK).noLootTable())); public static final DeferredBlock DUPLICATOR_LOG = BLOCKS.register("duplicator_log", () -> new DuplicatorLogBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_LOG).randomTicks())); public static final DeferredBlock OURANWOOD_LOG = BLOCKS.register("ouranwood_log", @@ -410,8 +422,8 @@ public final class AntarchyNeoforgeBlocks { () -> new WallBlock(AntarchyObjects.shellstoneProperties())); public static final DeferredBlock SHELLSTONE_PILLAR = BLOCKS.register("shellstone_pillar", () -> new RotatedPillarBlock(AntarchyObjects.shellstoneProperties())); - public static final DeferredBlock TRIFFID_GOO_BLOCK = BLOCKS.register("triffid_goo_block", - () -> new com.craisinlord.antarchy.content.block.TriffidGooBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SLIME_BLOCK).noOcclusion().isViewBlocking((s, l, p) -> false).isSuffocating((s, l, p) -> false))); + public static final DeferredBlock FLYTRAP_GOO_BLOCK = BLOCKS.register("flytrap_goo_block", + () -> new com.craisinlord.antarchy.content.block.FlytrapGooBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SLIME_BLOCK).noOcclusion().isViewBlocking((s, l, p) -> false).isSuffocating((s, l, p) -> false))); public static final DeferredBlock CLOUD_BLOCK = BLOCKS.register("cloud_block", () -> new com.craisinlord.antarchy.content.block.CloudBlock( AntarchyNeoforgeItems::cloudBucketItem, @@ -562,20 +574,20 @@ public final class AntarchyNeoforgeBlocks { .noOcclusion() .noCollission() .replaceable())); - public static final DeferredBlock CREEPING_HORROR_EGG = BLOCKS.register("creeping_horror_egg", - () -> new CreepingHorrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); + public static final DeferredBlock CRAWLING_BLIGHT_EGG = BLOCKS.register("crawling_blight_egg", + () -> new CrawlingBlightEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); public static final DeferredBlock PRINCE_EGG = BLOCKS.register("prince_egg", () -> new com.craisinlord.antarchy.content.block.PrinceEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DRAGON_EGG).randomTicks().noOcclusion())); public static final DeferredBlock PRINCESS_EGG = BLOCKS.register("princess_egg", () -> new com.craisinlord.antarchy.content.block.PrincessEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.DRAGON_EGG).randomTicks().noOcclusion())); - public static final DeferredBlock JUMPY_BUG_EGG = BLOCKS.register("jumpy_bug_egg", - () -> new JumpyBugEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); + public static final DeferredBlock SPRINGBUG_EGG = BLOCKS.register("springbug_egg", + () -> new SpringbugEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); public static final DeferredBlock SPIT_BUG_EGG = BLOCKS.register("spit_bug_egg", () -> new SpitBugEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); public static final DeferredBlock JERRY_EGG = BLOCKS.register("jerry_egg", () -> new JerryEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG).randomTicks())); - public static final DeferredBlock LURKING_TERROR_EGG = BLOCKS.register("lurking_terror_egg", - () -> new LurkingTerrorEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); + public static final DeferredBlock SKULKING_FRIGHT_EGG = BLOCKS.register("skulking_fright_egg", + () -> new SkulkingFrightEggBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG))); static { BiowartBlock.bindTendrils(BIOWART_TENDRILS); @@ -936,9 +948,26 @@ public final class AntarchyNeoforgeBlocks { (pos, state) -> new DimensionalTearMarkerBlockEntity(pos, state, AntarchyNeoforgeBlocks::dimensionalTearMarkerBlockEntityType), DIMENSIONAL_TEAR_MARKER.get() ).build(null)); + public static final DeferredHolder, BlockEntityType> QUEEN_TRAIL_SPAWN_MARKER_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("queen_trail_spawn_marker", + () -> BlockEntityType.Builder.of( + (pos, state) -> new QueenTrailSpawnMarkerBlockEntity(pos, state, AntarchyNeoforgeBlocks::queenTrailSpawnMarkerBlockEntityType), + QUEEN_TRAIL_SPAWN_MARKER.get() + ).build(null)); + public static final DeferredHolder, BlockEntityType> UNDERTRIAL_SPAWNER_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("undertrial_spawner", + () -> BlockEntityType.Builder.of((pos, state) -> new UndertrialSpawnerBlockEntity(pos, state, AntarchyNeoforgeBlocks::undertrialSpawnerBlockEntityType), UNDERTRIAL_SPAWNER.get()).build(null)); + public static final DeferredHolder, BlockEntityType> UNDERVAULT_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("undervault", + () -> BlockEntityType.Builder.of((pos, state) -> new UnderVaultBlockEntity(pos, state, AntarchyNeoforgeBlocks::underVaultBlockEntityType), UNDERVAULT.get()).build(null)); private AntarchyNeoforgeBlocks() {} + private static BlockEntityType undertrialSpawnerBlockEntityType() { + return UNDERTRIAL_SPAWNER_BLOCK_ENTITY.get(); + } + + private static BlockEntityType underVaultBlockEntityType() { + return UNDERVAULT_BLOCK_ENTITY.get(); + } + public static void register(IEventBus modEventBus) { BLOCKS.register(modEventBus); BLOCK_ENTITY_TYPES.register(modEventBus); @@ -1033,6 +1062,10 @@ public final class AntarchyNeoforgeBlocks { return DIMENSIONAL_TEAR_MARKER_BLOCK_ENTITY.get(); } + private static BlockEntityType queenTrailSpawnMarkerBlockEntityType() { + return QUEEN_TRAIL_SPAWN_MARKER_BLOCK_ENTITY.get(); + } + private static final class SimpleHorizontalFacingBlock extends HorizontalDirectionalBlock { private static final MapCodec CODEC = simpleCodec(SimpleHorizontalFacingBlock::new); 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 4f240e90..cbbb9df4 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 @@ -4,7 +4,7 @@ import com.craisinlord.antarchy.Antarchy; import com.craisinlord.antarchy.content.entity.AppleCowEntityVariants.AppleCow; import com.craisinlord.antarchy.content.entity.AppleCowEntityVariants.EnchantedGoldenAppleCow; import com.craisinlord.antarchy.content.entity.AppleCowEntityVariants.GoldenAppleCow; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import com.craisinlord.antarchy.content.entity.BedBugEntity; import com.craisinlord.antarchy.content.entity.BomberEntity; import com.craisinlord.antarchy.content.entity.ButterflyEntity; @@ -22,7 +22,7 @@ import com.craisinlord.antarchy.content.entity.WormHookProjectileEntity; import com.craisinlord.antarchy.content.entity.HerculesBeetleEntity; import com.craisinlord.antarchy.content.entity.HoverboardEntity; import com.craisinlord.antarchy.content.entity.JerryEntity; -import com.craisinlord.antarchy.content.entity.JumpyBugEntity; +import com.craisinlord.antarchy.content.entity.SpringbugEntity; import com.craisinlord.antarchy.content.entity.AlphaMantisEntity; import com.craisinlord.antarchy.content.entity.RollyPollyEntity; import com.craisinlord.antarchy.content.entity.MantisEntity; @@ -47,7 +47,7 @@ import com.craisinlord.antarchy.content.entity.SizeRayProjectileEntity; import com.craisinlord.antarchy.content.entity.SpitBugEntity; import com.craisinlord.antarchy.content.entity.SpitBugProjectileEntity; import com.craisinlord.antarchy.content.entity.StinkBugEntity; -import com.craisinlord.antarchy.content.entity.TriffidEntity; +import com.craisinlord.antarchy.content.entity.FlytrapEntity; import com.craisinlord.antarchy.content.entity.UpwardFallingBlockEntity; import com.craisinlord.antarchy.content.entity.WaspEntity; import com.craisinlord.antarchy.content.entity.ant.BaseAntEntity; @@ -74,9 +74,9 @@ 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.CrawlingBlightEntity; import com.craisinlord.antarchy.content.entity.DorrieEntity; -import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity; +import com.craisinlord.antarchy.content.entity.SkulkingFrightEntity; import com.craisinlord.antarchy.content.entity.ManticoreEntity; import com.craisinlord.antarchy.content.entity.ToreterrorEntity; import com.craisinlord.antarchy.content.entity.WaterBombEntity; @@ -207,11 +207,11 @@ public final class AntarchyNeoforgeEntites { .sized(1.95F, 1.1F) .clientTrackingRange(10) .build("molevore")); - public static final DeferredHolder, EntityType> TRIFFID = ENTITY_TYPES.register("triffid", - () -> EntityType.Builder.of(TriffidEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> FLYTRAP = ENTITY_TYPES.register("flytrap", + () -> EntityType.Builder.of(FlytrapEntity::new, MobCategory.MONSTER) .sized(2.0F, 5.0F) .clientTrackingRange(10) - .build("triffid")); + .build("flytrap")); public static final DeferredHolder, EntityType> BED_BUG = ENTITY_TYPES.register("bed_bug", () -> EntityType.Builder.of(BedBugEntity::new, MobCategory.CREATURE) .sized(1.15F, 0.8F) @@ -232,11 +232,11 @@ public final class AntarchyNeoforgeEntites { .sized(0.55F, 0.75F) .clientTrackingRange(8) .build("bomber")); - public static final DeferredHolder, EntityType> JUMPY_BUG = ENTITY_TYPES.register("jumpy_bug", - () -> EntityType.Builder.of(JumpyBugEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> SPRINGBUG = ENTITY_TYPES.register("springbug", + () -> EntityType.Builder.of(SpringbugEntity::new, MobCategory.MONSTER) .sized(3.0F, 6.0F) .clientTrackingRange(8) - .build("jumpy_bug")); + .build("springbug")); public static final DeferredHolder, EntityType> SPIT_BUG = ENTITY_TYPES.register("spit_bug", () -> EntityType.Builder.of(SpitBugEntity::new, MobCategory.MONSTER) .sized(2.5F, 3.0F) @@ -306,11 +306,11 @@ public final class AntarchyNeoforgeEntites { .sized(0.6F, 1.95F) .clientTrackingRange(10) .build("dr_trayaurus")); - public static final DeferredHolder, EntityType> CLOUD_SHARK = ENTITY_TYPES.register("cloud_shark", - () -> EntityType.Builder.of(CloudSharkEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> STRATOSHARK = ENTITY_TYPES.register("stratoshark", + () -> EntityType.Builder.of(StratosharkEntity::new, MobCategory.MONSTER) .sized(2.4F, 0.9F) .clientTrackingRange(10) - .build("cloud_shark")); + .build("stratoshark")); public static final DeferredHolder, EntityType> KRAKEN = ENTITY_TYPES.register("kraken", () -> EntityType.Builder.of(KrakenEntity::new, MobCategory.MONSTER) .sized(11.4F, 39.0F) @@ -492,16 +492,16 @@ public final class AntarchyNeoforgeEntites { .clientTrackingRange(8) .updateInterval(1) .build("water_bomb")); - public static final DeferredHolder, EntityType> CREEPING_HORROR = ENTITY_TYPES.register("creeping_horror", - () -> EntityType.Builder.of(CreepingHorrorEntity::new, MobCategory.MONSTER) + public static final DeferredHolder, EntityType> CRAWLING_BLIGHT = ENTITY_TYPES.register("crawling_blight", + () -> EntityType.Builder.of(CrawlingBlightEntity::new, MobCategory.MONSTER) .sized(1.3F, 1.5F) .clientTrackingRange(10) - .build("creeping_horror")); - public static final DeferredHolder, EntityType> LURKING_TERROR = ENTITY_TYPES.register("lurking_terror", - () -> EntityType.Builder.of(LurkingTerrorEntity::new, MobCategory.MONSTER) + .build("crawling_blight")); + public static final DeferredHolder, EntityType> SKULKING_FRIGHT = ENTITY_TYPES.register("skulking_fright", + () -> EntityType.Builder.of(SkulkingFrightEntity::new, MobCategory.MONSTER) .sized(1.3F, 1.5F) .clientTrackingRange(10) - .build("lurking_terror")); + .build("skulking_fright")); public static final DeferredHolder, EntityType> MANTICORE = ENTITY_TYPES.register("manticore", () -> EntityType.Builder.of(ManticoreEntity::new, MobCategory.MONSTER) .sized(1.95F, 2.25F) diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java index 090e7104..0cdeaa8d 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeEntityAttributes.java @@ -2,12 +2,12 @@ package com.craisinlord.antarchy.neoforge.registry; import com.craisinlord.antarchy.config.AntarchySettings; import com.craisinlord.antarchy.content.entity.*; -import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity; -import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity; +import com.craisinlord.antarchy.content.entity.CrawlingBlightEntity; +import com.craisinlord.antarchy.content.entity.SkulkingFrightEntity; import com.craisinlord.antarchy.content.entity.ManticoreEntity; import com.craisinlord.antarchy.content.entity.basilisk.BasiliskEntity; import com.craisinlord.antarchy.content.entity.brutalfly.BrutalflyEntity; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import com.craisinlord.antarchy.content.entity.flying_squirrel.FlyingSquirrelEntity; import com.craisinlord.antarchy.content.entity.kraken.KrakenEntity; import com.craisinlord.antarchy.content.entity.kraken.TentacleEntity; @@ -49,7 +49,7 @@ public class AntarchyNeoforgeEntityAttributes { ).build()); event.put(AntarchyNeoforgeEntites.ROLLY_POLLY.get(), RollyPollyEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.DR_TRAYAURUS.get(), Villager.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.CLOUD_SHARK.get(), CloudSharkEntity.createAttributes().build()); + event.put(AntarchyNeoforgeEntites.STRATOSHARK.get(), StratosharkEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.KRAKEN.get(), KrakenEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.MISSILE_SQUID.get(), MissileSquidEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.OCTOPUS_BOMB.get(), OctopusBombEntity.createAttributes().build()); @@ -59,19 +59,19 @@ public class AntarchyNeoforgeEntityAttributes { event.put(AntarchyNeoforgeEntites.STINK_BUG.get(), StinkBugEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.WASP.get(), WaspEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.BOMBER.get(), BomberEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.JUMPY_BUG.get(), JumpyBugEntity.createAttributes().build()); + event.put(AntarchyNeoforgeEntites.SPRINGBUG.get(), SpringbugEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.SPIT_BUG.get(), SpitBugEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.MANTIS.get(), MantisEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.ALPHA_MANTIS.get(), AlphaMantisEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.TRIFFID.get(), TriffidEntity.createAttributes().build()); + event.put(AntarchyNeoforgeEntites.FLYTRAP.get(), FlytrapEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.LUCID.get(), LucidEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.VORTEX.get(), com.craisinlord.antarchy.content.entity.vortex.VortexEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.SCORPION.get(), ScorpionEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.BASILISK.get(), BasiliskEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), EmperorScorpionEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.TORETERROR.get(), ToreterrorEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), CreepingHorrorEntity.createAttributes().build()); - event.put(AntarchyNeoforgeEntites.LURKING_TERROR.get(), LurkingTerrorEntity.createAttributes().build()); + event.put(AntarchyNeoforgeEntites.CRAWLING_BLIGHT.get(), CrawlingBlightEntity.createAttributes().build()); + event.put(AntarchyNeoforgeEntites.SKULKING_FRIGHT.get(), SkulkingFrightEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.MANTICORE.get(), ManticoreEntity.createAttributes().build()); event.put(AntarchyNeoforgeEntites.JERRY.get(), JerryEntity.createAttributes().build()); 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 22aa7e67..f63da2c6 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 @@ -14,7 +14,7 @@ import com.craisinlord.antarchy.content.item.BloodCrystalShardItem; import com.craisinlord.antarchy.content.item.ultimate.*; import com.craisinlord.antarchy.content.item.NightmareArmorItem; import com.craisinlord.antarchy.content.item.PrimordialArmorItem; -import com.craisinlord.antarchy.content.item.JumpyBootsItem; +import com.craisinlord.antarchy.content.item.SpringyBootsItem; import com.craisinlord.antarchy.content.item.WaterCannonItem; import com.craisinlord.antarchy.content.item.NightmareSwordItem; import com.craisinlord.antarchy.content.item.LucidEyeItem; @@ -181,13 +181,13 @@ public final class AntarchyNeoforgeItems { 3.5F, 0.1F )); - private static final DeferredHolder JUMPY_BOOTS_ARMOR_MATERIAL = ARMOR_MATERIALS.register("jumpy_boots", + private static final DeferredHolder SPRINGY_BOOTS_ARMOR_MATERIAL = ARMOR_MATERIALS.register("springy_boots", () -> new ArmorMaterial( - createJumpyBootsDefense(), + createSpringyBootsDefense(), 15, SoundEvents.ARMOR_EQUIP_NETHERITE, () -> Ingredient.of(Items.NETHERITE_BOOTS), - List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "jumpy_boots"))), + List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "springy_boots"))), 3.0F, 0.1F )); @@ -261,6 +261,9 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem SEASHELL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SEASHELL); public static final DeferredItem LUCID_ANCHOR_ITEM = ITEMS.register("lucid_anchor", () -> new LucidAnchorBlockItem(AntarchyNeoforgeBlocks.LUCID_ANCHOR.get(), new Item.Properties().rarity(Rarity.UNCOMMON))); + public static final DeferredItem UNDERTRIAL_SPAWNER_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.UNDERTRIAL_SPAWNER); + public static final DeferredItem UNDERVAULT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.UNDERVAULT); + public static final DeferredItem UNDERTRIAL_KEY = ITEMS.register("undertrial_key", () -> new Item(new Item.Properties())); public static final DeferredItem LOTUS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.LOTUS); public static final DeferredItem OURANWOOD_SIGN_ITEM = ITEMS.register("ouranwood_sign", () -> new net.minecraft.world.item.SignItem(new Item.Properties().stacksTo(16), AntarchyNeoforgeBlocks.OURANWOOD_SIGN.get(), AntarchyNeoforgeBlocks.OURANWOOD_WALL_SIGN.get())); @@ -629,8 +632,8 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem SHELLSTONE_BRICK_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_SLAB); public static final DeferredItem SHELLSTONE_BRICK_WALL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_WALL); public static final DeferredItem SHELLSTONE_PILLAR_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_PILLAR); - public static final DeferredItem TRIFFID_GOO_BLOCK_ITEM = ITEMS.register("triffid_goo_block", - () -> new com.craisinlord.antarchy.content.item.TriffidGooBlockItem(AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), new Item.Properties())); + public static final DeferredItem FLYTRAP_GOO_BLOCK_ITEM = ITEMS.register("flytrap_goo_block", + () -> new com.craisinlord.antarchy.content.item.FlytrapGooBlockItem(AntarchyNeoforgeBlocks.FLYTRAP_GOO_BLOCK.get(), new Item.Properties())); public static final DeferredItem PALE_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PALE_NYXITE); public static final DeferredItem NYXITE_SPIKE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_SPIKE); public static final DeferredItem CHITIN_SPIKE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHITIN_SPIKE); @@ -651,15 +654,15 @@ public final class AntarchyNeoforgeItems { public static final DeferredItem LUMEN_FROGLIGHT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.LUMEN_FROGLIGHT); public static final DeferredItem ROSEATE_FROGLIGHT_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.ROSEATE_FROGLIGHT); public static final DeferredItem BED_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.BED_BUG_EGG); - public static final DeferredItem CREEPING_HORROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CREEPING_HORROR_EGG); + public static final DeferredItem CRAWLING_BLIGHT_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CRAWLING_BLIGHT_EGG); public static final DeferredItem PRINCE_EGG_ITEM = ITEMS.register("prince_egg", () -> new net.minecraft.world.item.BlockItem(AntarchyNeoforgeBlocks.PRINCE_EGG.get(), new Item.Properties().rarity(Rarity.EPIC).fireResistant())); public static final DeferredItem PRINCESS_EGG_ITEM = ITEMS.register("princess_egg", () -> new net.minecraft.world.item.BlockItem(AntarchyNeoforgeBlocks.PRINCESS_EGG.get(), new Item.Properties().rarity(Rarity.EPIC).fireResistant())); - public static final DeferredItem JUMPY_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.JUMPY_BUG_EGG); + public static final DeferredItem SPRINGBUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SPRINGBUG_EGG); public static final DeferredItem SPIT_BUG_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SPIT_BUG_EGG); public static final DeferredItem JERRY_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.JERRY_EGG); - public static final DeferredItem LURKING_TERROR_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.LURKING_TERROR_EGG); + public static final DeferredItem SKULKING_FRIGHT_EGG_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SKULKING_FRIGHT_EGG); public static final DeferredItem WASP_NEST_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.WASP_NEST); public static final DeferredItem HUSHWEED_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.HUSHWEED); public static final DeferredItem HANGING_CREEPROOTS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.HANGING_CREEPROOTS); @@ -724,9 +727,9 @@ public final class AntarchyNeoforgeItems { .saturationModifier(0.1F) .build()))); public static final DeferredItem STINK_BUG = ITEMS.registerSimpleItem("stink_bug", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem JUMPY_BUG_LEG = ITEMS.registerSimpleItem("jumpy_bug_leg", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem JUMPY_BOOTS = ITEMS.register("jumpy_boots", - () -> new JumpyBootsItem(JUMPY_BOOTS_ARMOR_MATERIAL, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).fireResistant().durability(ArmorItem.Type.BOOTS.getDurability(37)))); + public static final DeferredItem SPRINGBUG_LEG = ITEMS.registerSimpleItem("springbug_leg", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final DeferredItem SPRINGY_BOOTS = ITEMS.register("springy_boots", + () -> new SpringyBootsItem(SPRINGY_BOOTS_ARMOR_MATERIAL, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON).fireResistant().durability(ArmorItem.Type.BOOTS.getDurability(37)))); public static final DeferredItem BRUTALFLY_WING = ITEMS.registerSimpleItem("brutalfly_wing", new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredItem BRUTALFLY_ELYTRA = ITEMS.register("brutalfly_elytra", () -> new BrutalflyElytraItem(new Item.Properties().rarity(Rarity.UNCOMMON).durability(480))); @@ -841,7 +844,7 @@ public final class AntarchyNeoforgeItems { .effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 100, 0), 1.0F) .alwaysEdible() .build()))); - public static final DeferredItem TRIFFID_GOO = ITEMS.registerSimpleItem("triffid_goo", + public static final DeferredItem FLYTRAP_GOO = ITEMS.registerSimpleItem("flytrap_goo", new Item.Properties().rarity(Rarity.UNCOMMON)); public static final DeferredItem VORTEX_CHARGE = ITEMS.register("vortex_charge", () -> new VortexChargeItem(new Item.Properties().stacksTo(64).rarity(Rarity.RARE), AntarchyNeoforgeEntites.VORTEX_CHARGE_PROJECTILE)); @@ -876,9 +879,9 @@ public final class AntarchyNeoforgeItems { () -> new Item(new Item.Properties().rarity(Rarity.UNCOMMON))); public static final DeferredItem WORM_HOOK = ITEMS.register("worm_hook", () -> new WormHookItem(new Item.Properties().stacksTo(1).durability(256).rarity(Rarity.UNCOMMON))); - public static final DeferredItem CLOUD_SHARK_FIN = ITEMS.registerSimpleItem("cloud_shark_fin", new Item.Properties().rarity(Rarity.UNCOMMON)); - public static final DeferredItem CLOUD_SHARK_FIN_SOUP = ITEMS.register("cloud_shark_fin_soup", - () -> new CloudSharkFinSoupItem(new Item.Properties() + public static final DeferredItem STRATOSHARK_FIN = ITEMS.registerSimpleItem("stratoshark_fin", new Item.Properties().rarity(Rarity.UNCOMMON)); + public static final DeferredItem STRATOSHARK_FIN_SOUP = ITEMS.register("stratoshark_fin_soup", + () -> new StratosharkFinSoupItem(new Item.Properties() .stacksTo(1) .craftRemainder(Items.BOWL) .food(new FoodProperties.Builder() @@ -1114,8 +1117,8 @@ public final class AntarchyNeoforgeItems { () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.ROLLY_POLLY, 0x7284A3, 0xBCC8DB, new Item.Properties())); public static final DeferredItem MOLEVORE_SPAWN_EGG = ITEMS.register("molevore_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.MOLEVORE, 0x4A4A4A, 0x6B4A2B, new Item.Properties().rarity(Rarity.UNCOMMON))); - public static final DeferredItem TRIFFID_SPAWN_EGG = ITEMS.register("triffid_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.TRIFFID, 0x4C8F3A, 0xFF2FB3, new Item.Properties().rarity(Rarity.UNCOMMON))); + public static final DeferredItem FLYTRAP_SPAWN_EGG = ITEMS.register("flytrap_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.FLYTRAP, 0x4C8F3A, 0xFF2FB3, new Item.Properties().rarity(Rarity.UNCOMMON))); public static final DeferredItem APPLE_COW_SPAWN_EGG = ITEMS.register("apple_cow_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.APPLE_COW, 0xFF1A1A, 0x32FF32, new Item.Properties())); public static final DeferredItem GOLDEN_APPLE_COW_SPAWN_EGG = ITEMS.register("golden_apple_cow_spawn_egg", @@ -1128,14 +1131,14 @@ public final class AntarchyNeoforgeItems { () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.WASP, 0x111111, 0xF1D800, new Item.Properties())); public static final DeferredItem BOMBER_SPAWN_EGG = ITEMS.register("bomber_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.BOMBER, 0x7A7A7A, 0xB32020, new Item.Properties())); - public static final DeferredItem JUMPY_BUG_SPAWN_EGG = ITEMS.register("jumpy_bug_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.JUMPY_BUG, 0x0A1636, 0x8A3E00, new Item.Properties())); + public static final DeferredItem SPRINGBUG_SPAWN_EGG = ITEMS.register("springbug_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.SPRINGBUG, 0x0A1636, 0x8A3E00, new Item.Properties())); public static final DeferredItem SPIT_BUG_SPAWN_EGG = ITEMS.register("spit_bug_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.SPIT_BUG, 0x6B4A2B, 0x7ED957, new Item.Properties())); public static final DeferredItem STINK_BUG_SPAWN_EGG = ITEMS.register("stink_bug_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.STINK_BUG, 0x111111, 0xFF7A00, new Item.Properties())); - public static final DeferredItem CLOUD_SHARK_SPAWN_EGG = ITEMS.register("cloud_shark_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CLOUD_SHARK, 0xDDEAF4, 0x7F96A8, new Item.Properties())); + public static final DeferredItem STRATOSHARK_SPAWN_EGG = ITEMS.register("stratoshark_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.STRATOSHARK, 0xDDEAF4, 0x7F96A8, new Item.Properties())); public static final DeferredItem KRAKEN_SPAWN_EGG = ITEMS.register("kraken_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.KRAKEN, 0x163C53, 0x4F8E99, new Item.Properties().rarity(Rarity.EPIC))); public static final DeferredItem MISSILE_SQUID_SPAWN_EGG = ITEMS.register("missile_squid_spawn_egg", @@ -1175,10 +1178,10 @@ public final class AntarchyNeoforgeItems { () -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS, new Item.Properties().stacksTo(1).rarity(Rarity.RARE).fireResistant())); public static final DeferredItem PRIMORDIAL_BOOTS = ITEMS.register("primordial_boots", () -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1).rarity(Rarity.RARE).fireResistant())); - public static final DeferredItem CREEPING_HORROR_SPAWN_EGG = ITEMS.register("creeping_horror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CREEPING_HORROR, 0x6B3A1F, 0x6B0000, new Item.Properties())); - public static final DeferredItem LURKING_TERROR_SPAWN_EGG = ITEMS.register("lurking_terror_spawn_egg", - () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.LURKING_TERROR, 0x2D5A1B, 0x8B0000, new Item.Properties())); + public static final DeferredItem CRAWLING_BLIGHT_SPAWN_EGG = ITEMS.register("crawling_blight_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.CRAWLING_BLIGHT, 0x6B3A1F, 0x6B0000, new Item.Properties())); + public static final DeferredItem SKULKING_FRIGHT_SPAWN_EGG = ITEMS.register("skulking_fright_spawn_egg", + () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.SKULKING_FRIGHT, 0x2D5A1B, 0x8B0000, new Item.Properties())); public static final DeferredItem MANTICORE_SPAWN_EGG = ITEMS.register("manticore_spawn_egg", () -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.MANTICORE, 0xA3AEE9, 0x956570, new Item.Properties())); public static final DeferredItem HERCULES_BEETLE_SPAWN_EGG = ITEMS.register("hercules_beetle_spawn_egg", @@ -1313,7 +1316,7 @@ public final class AntarchyNeoforgeItems { return defense; } - private static EnumMap createJumpyBootsDefense() { + private static EnumMap createSpringyBootsDefense() { EnumMap defense = new EnumMap<>(ArmorItem.Type.class); defense.put(ArmorItem.Type.BOOTS, 3); defense.put(ArmorItem.Type.LEGGINGS, 0); 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 5bfae5f0..66ce19ea 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 @@ -234,6 +234,12 @@ public final class AntarchyNeoforgeMisc { () -> new SimpleParticleType(true)); public static final DeferredHolder, SimpleParticleType> LUCID_BOLT_IMPACT_LARGE = PARTICLE_TYPES.register("lucid_bolt_impact_large", () -> new SimpleParticleType(true)); + public static final DeferredHolder, SimpleParticleType> UNDERTRIAL_SPAWNER_DETECTION = PARTICLE_TYPES.register("undertrial_spawner_detection", + () -> new SimpleParticleType(true)); + public static final DeferredHolder, SimpleParticleType> UNDERTRIAL_OMEN = PARTICLE_TYPES.register("undertrial_omen", + () -> new SimpleParticleType(true)); + public static final DeferredHolder, SimpleParticleType> UNDERVAULT_CONNECTION = PARTICLE_TYPES.register("undervault_connection", + () -> new SimpleParticleType(true)); public static final DeferredHolder, ParticleType> INVERTED_GEYSER_BASE = PARTICLE_TYPES.register("inverted_geyser_base", () -> particleType(InvertedGeyserBaseParticleOptions::codec, InvertedGeyserBaseParticleOptions::streamCodec)); public static final DeferredHolder, ParticleType> INVERTED_GEYSER_PLUME = PARTICLE_TYPES.register("inverted_geyser_plume", @@ -302,8 +308,8 @@ public final class AntarchyNeoforgeMisc { () -> new MolewormWarrensFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, MolewormSurfaceMoundsFeature> ELYTHIA_MOLEWORM_SURFACE_MOUNDS = FEATURES.register("elythia_moleworm_surface_mounds", () -> new MolewormSurfaceMoundsFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, TriffidPatchFeature> TRIFFID_PATCH = FEATURES.register("triffid_patch", - () -> new TriffidPatchFeature(NoneFeatureConfiguration.CODEC)); + public static final DeferredHolder, FlytrapPatchFeature> FLYTRAP_PATCH = FEATURES.register("flytrap_patch", + () -> new FlytrapPatchFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, ElythiaPondFeature> ELYTHIA_POND = FEATURES.register("elythia_pond", () -> new ElythiaPondFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, LumenPoolFeature> LUMEN_POOL = FEATURES.register("lumen_pools", @@ -340,6 +346,10 @@ public final class AntarchyNeoforgeMisc { () -> new FungalMushroomFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, ThoraxisFissureFeature> THORAXIS_FISSURE = FEATURES.register("thoraxis_fissure", () -> new ThoraxisFissureFeature(ThoraxisFissureConfiguration.CODEC)); + public static final DeferredHolder, ThoraxisTransitionThroatFeature> THORAXIS_TRANSITION_THROAT = FEATURES.register("thoraxis_transition_throat", + ThoraxisTransitionThroatFeature::new); + public static final DeferredHolder, QueenHavocTrailFeature> QUEEN_HAVOC_TRAIL = FEATURES.register("queen_havoc_trail", + QueenHavocTrailFeature::new); public static final DeferredHolder, ThoraxisRibColumnsFeature> THORAXIS_RIB_COLUMNS = FEATURES.register("thoraxis_rib_columns", () -> new ThoraxisRibColumnsFeature(ThoraxisRibColumnsConfiguration.CODEC)); public static final DeferredHolder, ThoraxisSpikeFeature> THORAXIS_SPIKE = FEATURES.register("thoraxis_spike", @@ -366,8 +376,8 @@ public final class AntarchyNeoforgeMisc { () -> new MoltingVinesFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.GroundMoltingVinesFeature> GROUND_MOLTING_VINES = FEATURES.register("ground_molting_vines", () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.GroundMoltingVinesFeature(NoneFeatureConfiguration.CODEC)); - public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.JumpyBugEggCeilingFeature> JUMPY_BUG_EGG_CEILING = FEATURES.register("jumpy_bug_egg_ceiling", - () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.JumpyBugEggCeilingFeature(NoneFeatureConfiguration.CODEC)); + public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.SpringbugEggCeilingFeature> SPRINGBUG_EGG_CEILING = FEATURES.register("springbug_egg_ceiling", + () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.SpringbugEggCeilingFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.SpitBugEggPatchFeature> SPIT_BUG_EGG_PATCH = FEATURES.register("spit_bug_egg_patch", () -> new com.craisinlord.antarchy.content.worldgen.cavaryn.SpitBugEggPatchFeature(NoneFeatureConfiguration.CODEC)); public static final DeferredHolder, com.craisinlord.antarchy.content.worldgen.cavaryn.RollyCavesGiantCavernFeature> ROLLY_CAVES_GIANT_CAVERN = FEATURES.register("rolly_caves_giant_cavern", diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgePayloadHandlers.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgePayloadHandlers.java index 2a0365b1..6bf60936 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgePayloadHandlers.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgePayloadHandlers.java @@ -8,7 +8,7 @@ import com.craisinlord.antarchy.neoforge.network.AntarchyGravityNetworking; import com.craisinlord.antarchy.neoforge.network.BrutalflyElytraNetworking; import com.craisinlord.antarchy.neoforge.network.DorrieJumpNetworking; import com.craisinlord.antarchy.neoforge.network.HerculesBeetleNetworking; -import com.craisinlord.antarchy.neoforge.network.JumpyBootsNetworking; +import com.craisinlord.antarchy.neoforge.network.SpringyBootsNetworking; import com.craisinlord.antarchy.neoforge.network.MultipartNetworking; import com.craisinlord.antarchy.neoforge.network.AntarchyTimeDilationNetworking; import net.neoforged.bus.api.IEventBus; @@ -26,7 +26,7 @@ public class AntarchyNeoforgePayloadHandlers { AntarchyGravityNetworking.register(registrar); AntarchyTimeDilationNetworking.register(registrar); BrutalflyElytraNetworking.register(registrar); - JumpyBootsNetworking.register(registrar); + SpringyBootsNetworking.register(registrar); DorrieJumpNetworking.register(registrar); HerculesBeetleNetworking.register(registrar); registrar.playToClient( diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java index 2b19f989..98039eef 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java @@ -25,11 +25,11 @@ public final class AntarchyNeoforgeSounds { public static final DeferredHolder ANT_BITE = registerSoundEvent("ant_bite"); public static final DeferredHolder ANT_GATHER = registerSoundEvent("ant_gather"); public static final DeferredHolder ANT_NEST = registerSoundEvent("ant_nest"); - public static final DeferredHolder CLOUD_SHARK_BITE = registerSoundEvent("cloud_shark_bite"); - public static final DeferredHolder CLOUD_SHARK_IDLE = registerSoundEvent("cloud_shark_idle"); - public static final DeferredHolder CLOUD_SHARK_HURT = registerSoundEvent("cloud_shark_hurt"); - public static final DeferredHolder CLOUD_SHARK_DEATH = registerSoundEvent("cloud_shark_death"); - public static final DeferredHolder CLOUD_SHARK_FLY = registerSoundEvent("cloud_shark_fly"); + public static final DeferredHolder STRATOSHARK_BITE = registerSoundEvent("stratoshark_bite"); + public static final DeferredHolder STRATOSHARK_IDLE = registerSoundEvent("stratoshark_idle"); + public static final DeferredHolder STRATOSHARK_HURT = registerSoundEvent("stratoshark_hurt"); + public static final DeferredHolder STRATOSHARK_DEATH = registerSoundEvent("stratoshark_death"); + public static final DeferredHolder STRATOSHARK_FLY = registerSoundEvent("stratoshark_fly"); public static final DeferredHolder CATERPILLAR_IDLE = registerSoundEvent("caterpillar_idle"); public static final DeferredHolder CATERPILLAR_HURT = registerSoundEvent("caterpillar_hurt"); public static final DeferredHolder CATERPILLAR_CRAWL = registerSoundEvent("caterpillar_crawl"); @@ -102,12 +102,12 @@ public final class AntarchyNeoforgeSounds { public static final DeferredHolder NIGHTMARE_DEATH = registerSoundEvent("nightmare_death"); public static final DeferredHolder NIGHTMARE_BITE = registerSoundEvent("nightmare_bite"); public static final DeferredHolder NIGHTMARE_FLAP = registerSoundEvent("nightmare_flap"); - public static final DeferredHolder TRIFFID_ATTACK = registerSoundEvent("triffid_attack"); - public static final DeferredHolder TRIFFID_GRAB = registerSoundEvent("triffid_grab"); - public static final DeferredHolder TRIFFID_HURT = registerSoundEvent("triffid_hurt"); - public static final DeferredHolder TRIFFID_DEATH = registerSoundEvent("triffid_death"); - public static final DeferredHolder TRIFFID_HISS = registerSoundEvent("triffid_hiss"); - public static final DeferredHolder TRIFFID_GROWL = registerSoundEvent("triffid_growl"); + public static final DeferredHolder FLYTRAP_ATTACK = registerSoundEvent("flytrap_attack"); + public static final DeferredHolder FLYTRAP_GRAB = registerSoundEvent("flytrap_grab"); + public static final DeferredHolder FLYTRAP_HURT = registerSoundEvent("flytrap_hurt"); + public static final DeferredHolder FLYTRAP_DEATH = registerSoundEvent("flytrap_death"); + public static final DeferredHolder FLYTRAP_HISS = registerSoundEvent("flytrap_hiss"); + public static final DeferredHolder FLYTRAP_GROWL = registerSoundEvent("flytrap_growl"); public static final DeferredHolder MANTIS_AMBIENT = registerSoundEvent("mantis_ambient"); public static final DeferredHolder MANTIS_HURT = registerSoundEvent("mantis_hurt"); public static final DeferredHolder MANTIS_ATTACK = registerSoundEvent("mantis_attack"); @@ -166,23 +166,23 @@ public final class AntarchyNeoforgeSounds { public static final DeferredHolder ROLLY_POLLY_WHEEL_MODE = registerSoundEvent("rolly_polly_wheel_mode"); public static final DeferredHolder ROLLY_POLLY_NORMAL_MODE = registerSoundEvent("rolly_polly_normal_mode"); public static final DeferredHolder ROLLY_POLLY_ROLL = registerSoundEvent("rolly_polly_roll"); - public static final DeferredHolder CREEPING_HORROR_GROWL = registerSoundEvent("creeping_horror_growl"); - public static final DeferredHolder CREEPING_HORROR_HURT = registerSoundEvent("creeping_horror_hurt"); - public static final DeferredHolder CREEPING_HORROR_BITE = registerSoundEvent("creeping_horror_bite"); - public static final DeferredHolder LURKING_TERROR_SNARL = registerSoundEvent("lurking_terror_snarl"); - public static final DeferredHolder LURKING_TERROR_HURT = registerSoundEvent("lurking_terror_hurt"); - public static final DeferredHolder LURKING_TERROR_BITE = registerSoundEvent("lurking_terror_bite"); - public static final DeferredHolder LURKING_TERROR_FLY_LOOP = registerSoundEvent("lurking_terror_fly_loop"); + public static final DeferredHolder CRAWLING_BLIGHT_GROWL = registerSoundEvent("crawling_blight_growl"); + public static final DeferredHolder CRAWLING_BLIGHT_HURT = registerSoundEvent("crawling_blight_hurt"); + public static final DeferredHolder CRAWLING_BLIGHT_BITE = registerSoundEvent("crawling_blight_bite"); + public static final DeferredHolder SKULKING_FRIGHT_SNARL = registerSoundEvent("skulking_fright_snarl"); + public static final DeferredHolder SKULKING_FRIGHT_HURT = registerSoundEvent("skulking_fright_hurt"); + public static final DeferredHolder SKULKING_FRIGHT_BITE = registerSoundEvent("skulking_fright_bite"); + public static final DeferredHolder SKULKING_FRIGHT_FLY_LOOP = registerSoundEvent("skulking_fright_fly_loop"); public static final DeferredHolder HERCULES_BEETLE_IDLE = registerSoundEvent("hercules_beetle_idle"); public static final DeferredHolder HERCULES_BEETLE_HURT = registerSoundEvent("hercules_beetle_hurt"); public static final DeferredHolder HERCULES_BEETLE_ATTACK = registerSoundEvent("hercules_beetle_attack"); public static final DeferredHolder HERCULES_BEETLE_CRY = registerSoundEvent("hercules_beetle_cry"); public static final DeferredHolder HERCULES_BEETLE_CHARGE_START = registerSoundEvent("hercules_beetle_charge_start"); public static final DeferredHolder HERCULES_BEETLE_KNOCKED_DOWN = registerSoundEvent("hercules_beetle_knocked_down"); - public static final DeferredHolder JUMPY_BUG_IDLE = registerSoundEvent("jumpy_bug_idle"); + public static final DeferredHolder SPRINGBUG_IDLE = registerSoundEvent("springbug_idle"); public static final DeferredHolder SPIT_BUG_IDLE = registerSoundEvent("spit_bug_idle"); - public static final DeferredHolder JUMPY_BUG_HURT = registerSoundEvent("jumpy_bug_hurt"); - public static final DeferredHolder JUMPY_BUG_JUMP = registerSoundEvent("jumpy_bug_jump"); + public static final DeferredHolder SPRINGBUG_HURT = registerSoundEvent("springbug_hurt"); + public static final DeferredHolder SPRINGBUG_JUMP = registerSoundEvent("springbug_jump"); public static final DeferredHolder SPIT_BUG_HURT = registerSoundEvent("spit_bug_hurt"); public static final DeferredHolder SPIT_BUG_SPIT = registerSoundEvent("spit_bug_spit"); public static final DeferredHolder BRUTALFLY_SPIT = registerSoundEvent("brutalfly_spit"); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java index 59290e05..8fc65ac0 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSpawnPlacements.java @@ -3,7 +3,7 @@ package com.craisinlord.antarchy.neoforge.registry; import com.craisinlord.antarchy.content.entity.*; import net.minecraft.world.entity.animal.AbstractFish; import com.craisinlord.antarchy.content.entity.basilisk.BasiliskEntity; -import com.craisinlord.antarchy.content.entity.cloud_shark.CloudSharkEntity; +import com.craisinlord.antarchy.content.entity.stratoshark.StratosharkEntity; import com.craisinlord.antarchy.content.entity.flying_squirrel.FlyingSquirrelEntity; import com.craisinlord.antarchy.content.entity.kraken.KrakenEntity; import com.craisinlord.antarchy.content.entity.lucid.LucidEntity; @@ -31,10 +31,10 @@ public class AntarchyNeoforgeSpawnPlacements { event.register(AntarchyNeoforgeEntites.APPLE_COW.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Cow::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.GOLDEN_APPLE_COW.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Cow::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.ENCHANTED_GOLDEN_APPLE_COW.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Cow::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.CLOUD_SHARK.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CloudSharkEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); + event.register(AntarchyNeoforgeEntites.STRATOSHARK.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, StratosharkEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.WASP.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, WaspEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BOMBER.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BomberEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.JUMPY_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, JumpyBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); + event.register(AntarchyNeoforgeEntites.SPRINGBUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, SpringbugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.SPIT_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, SpitBugEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.KRAKEN.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, KrakenEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.MISSILE_SQUID.get(), SpawnPlacementTypes.IN_WATER, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MissileSquidEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); @@ -52,8 +52,8 @@ public class AntarchyNeoforgeSpawnPlacements { event.register(AntarchyNeoforgeEntites.SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ScorpionEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.BASILISK.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BasiliskEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EmperorScorpionEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.CREEPING_HORROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CreepingHorrorEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); - event.register(AntarchyNeoforgeEntites.LURKING_TERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LurkingTerrorEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); + event.register(AntarchyNeoforgeEntites.CRAWLING_BLIGHT.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, CrawlingBlightEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); + event.register(AntarchyNeoforgeEntites.SKULKING_FRIGHT.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, SkulkingFrightEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.MANTICORE.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.ManticoreEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.JERRY.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, JerryEntity::canSpawn, RegisterSpawnPlacementsEvent.Operation.OR); event.register(AntarchyNeoforgeEntites.TERMITE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules, RegisterSpawnPlacementsEvent.Operation.OR);