From 80b8cebb1925a5b5d8ef2791d345984bc9e05abd Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 25 Nov 2023 17:19:19 +1000 Subject: [PATCH] Fully integrated smooth animation transitioning into move animations --- .../client/entity/PokemonClientDelegate.kt | 10 +++- .../BedrockAnimationReferenceFactory.kt | 2 +- .../models/blockbench/PoseableEntityModel.kt | 10 +--- .../models/blockbench/PoseableEntityState.kt | 57 ++++++++++++------- .../blockbench/animation/PrimaryAnimation.kt | 12 ++-- .../animation/BedrockStatefulAnimation.kt | 10 ---- .../blockbench/pokeball/PokeBallModel.kt | 4 +- .../pokemon/JsonPokemonPoseableModel.kt | 15 ++--- .../pokemon/gen1/AerodactylModel.kt | 2 +- .../blockbench/pokemon/gen1/AlakazamModel.kt | 2 +- .../blockbench/pokemon/gen1/ArbokModel.kt | 4 +- .../blockbench/pokemon/gen1/BeedrillModel.kt | 2 +- .../blockbench/pokemon/gen1/BlastoiseModel.kt | 4 +- .../blockbench/pokemon/gen1/BulbasaurModel.kt | 4 +- .../pokemon/gen1/ButterfreeModel.kt | 2 +- .../blockbench/pokemon/gen1/CaterpieModel.kt | 4 +- .../blockbench/pokemon/gen1/ChanseyModel.kt | 2 +- .../blockbench/pokemon/gen1/CharizardModel.kt | 15 +++-- .../pokemon/gen1/CharmanderModel.kt | 4 +- .../pokemon/gen1/CharmeleonModel.kt | 4 +- .../blockbench/pokemon/gen1/ClefableModel.kt | 4 +- .../blockbench/pokemon/gen1/ClefairyModel.kt | 4 +- .../blockbench/pokemon/gen1/DiglettModel.kt | 2 +- .../blockbench/pokemon/gen1/DittoModel.kt | 4 +- .../blockbench/pokemon/gen1/DodrioModel.kt | 6 +- .../blockbench/pokemon/gen1/DoduoModel.kt | 8 +-- .../blockbench/pokemon/gen1/DragonairModel.kt | 2 +- .../blockbench/pokemon/gen1/DragoniteModel.kt | 2 +- .../blockbench/pokemon/gen1/DratiniModel.kt | 2 +- .../blockbench/pokemon/gen1/DrowzeeModel.kt | 2 +- .../blockbench/pokemon/gen1/DugtrioModel.kt | 6 +- .../blockbench/pokemon/gen1/EeveeModel.kt | 4 +- .../blockbench/pokemon/gen1/EkansModel.kt | 4 +- .../pokemon/gen1/ElectabuzzModel.kt | 2 +- .../blockbench/pokemon/gen1/ElectrodeModel.kt | 2 +- .../blockbench/pokemon/gen1/ExeggcuteModel.kt | 12 ++-- .../pokemon/gen1/ExeggutorAlolanModel.kt | 8 +-- .../blockbench/pokemon/gen1/ExeggutorModel.kt | 6 +- .../pokemon/gen1/FarfetchdGalarianModel.kt | 4 +- .../blockbench/pokemon/gen1/FarfetchdModel.kt | 10 ++-- .../blockbench/pokemon/gen1/FearowModel.kt | 4 +- .../blockbench/pokemon/gen1/FlareonModel.kt | 2 +- .../blockbench/pokemon/gen1/GastlyModel.kt | 2 +- .../pokemon/gen1/GastlyShinyModel.kt | 2 +- .../blockbench/pokemon/gen1/GeodudeModel.kt | 2 +- .../blockbench/pokemon/gen1/GolbatModel.kt | 4 +- .../blockbench/pokemon/gen1/GolduckModel.kt | 2 +- .../blockbench/pokemon/gen1/GolemModel.kt | 2 +- .../blockbench/pokemon/gen1/GravelerModel.kt | 2 +- .../blockbench/pokemon/gen1/GrimerModel.kt | 2 +- .../blockbench/pokemon/gen1/GrowlitheModel.kt | 2 +- .../blockbench/pokemon/gen1/GyaradosModel.kt | 2 +- .../blockbench/pokemon/gen1/HaunterModel.kt | 2 +- .../pokemon/gen1/HitmonchanModel.kt | 2 +- .../blockbench/pokemon/gen1/HitmonleeModel.kt | 2 +- .../blockbench/pokemon/gen1/HorseaModel.kt | 2 +- .../blockbench/pokemon/gen1/HypnoModel.kt | 2 +- .../blockbench/pokemon/gen1/IvysaurModel.kt | 4 +- .../pokemon/gen1/JigglypuffModel.kt | 2 +- .../blockbench/pokemon/gen1/JolteonModel.kt | 2 +- .../blockbench/pokemon/gen1/JynxModel.kt | 2 +- .../blockbench/pokemon/gen1/KadabraModel.kt | 2 +- .../blockbench/pokemon/gen1/KakunaModel.kt | 2 +- .../pokemon/gen1/KangaskhanModel.kt | 4 +- .../blockbench/pokemon/gen1/KoffingModel.kt | 2 +- .../blockbench/pokemon/gen1/KrabbyModel.kt | 6 +- .../blockbench/pokemon/gen1/LaprasModel.kt | 2 +- .../blockbench/pokemon/gen1/LickitungModel.kt | 2 +- .../blockbench/pokemon/gen1/MachampModel.kt | 2 +- .../blockbench/pokemon/gen1/MachokeModel.kt | 2 +- .../blockbench/pokemon/gen1/MachopModel.kt | 2 +- .../blockbench/pokemon/gen1/MagikarpModel.kt | 2 +- .../blockbench/pokemon/gen1/MagnemiteModel.kt | 2 +- .../blockbench/pokemon/gen1/MagnetonModel.kt | 2 +- .../blockbench/pokemon/gen1/MankeyModel.kt | 4 +- .../pokemon/gen1/MeowthAlolanModel.kt | 2 +- .../pokemon/gen1/MeowthGalarianModel.kt | 2 +- .../blockbench/pokemon/gen1/MeowthModel.kt | 2 +- .../blockbench/pokemon/gen1/MetapodModel.kt | 4 +- .../blockbench/pokemon/gen1/MewtwoModel.kt | 2 +- .../blockbench/pokemon/gen1/MrmimeModel.kt | 2 +- .../blockbench/pokemon/gen1/MukModel.kt | 2 +- .../blockbench/pokemon/gen1/NidokingModel.kt | 2 +- .../blockbench/pokemon/gen1/NidoqueenModel.kt | 4 +- .../blockbench/pokemon/gen1/NidorinaModel.kt | 2 +- .../blockbench/pokemon/gen1/NidorinoModel.kt | 2 +- .../pokemon/gen1/NinetalesAlolanModel.kt | 2 +- .../blockbench/pokemon/gen1/NinetalesModel.kt | 2 +- .../blockbench/pokemon/gen1/OddishModel.kt | 2 +- .../blockbench/pokemon/gen1/OnixModel.kt | 4 +- .../blockbench/pokemon/gen1/ParasModel.kt | 2 +- .../pokemon/gen1/PersianAlolanModel.kt | 2 +- .../blockbench/pokemon/gen1/PersianModel.kt | 2 +- .../blockbench/pokemon/gen1/PidgeotModel.kt | 4 +- .../blockbench/pokemon/gen1/PidgeottoModel.kt | 4 +- .../blockbench/pokemon/gen1/PidgeyModel.kt | 4 +- .../blockbench/pokemon/gen1/PikachuModel.kt | 4 +- .../blockbench/pokemon/gen1/PinsirModel.kt | 2 +- .../blockbench/pokemon/gen1/PoliwagModel.kt | 2 +- .../blockbench/pokemon/gen1/PoliwhirlModel.kt | 2 +- .../blockbench/pokemon/gen1/PoliwrathModel.kt | 2 +- .../pokemon/gen1/PonytaGalarianModel.kt | 6 +- .../blockbench/pokemon/gen1/PonytaModel.kt | 6 +- .../blockbench/pokemon/gen1/PorygonModel.kt | 2 +- .../blockbench/pokemon/gen1/PrimeapeModel.kt | 4 +- .../blockbench/pokemon/gen1/PsyduckModel.kt | 2 +- .../pokemon/gen1/RaichuAlolanModel.kt | 4 +- .../blockbench/pokemon/gen1/RaichuModel.kt | 4 +- .../pokemon/gen1/RapidashGalarianModel.kt | 4 +- .../blockbench/pokemon/gen1/RapidashModel.kt | 4 +- .../pokemon/gen1/RaticateAlolanModel.kt | 4 +- .../blockbench/pokemon/gen1/RaticateModel.kt | 4 +- .../pokemon/gen1/RattataAlolanModel.kt | 4 +- .../blockbench/pokemon/gen1/RattataModel.kt | 4 +- .../blockbench/pokemon/gen1/SandshrewModel.kt | 2 +- .../blockbench/pokemon/gen1/SandslashModel.kt | 2 +- .../blockbench/pokemon/gen1/ScytherModel.kt | 2 +- .../blockbench/pokemon/gen1/SeadraModel.kt | 2 +- .../blockbench/pokemon/gen1/SlowbroModel.kt | 6 +- .../blockbench/pokemon/gen1/SlowpokeModel.kt | 2 +- .../blockbench/pokemon/gen1/SpearowModel.kt | 4 +- .../blockbench/pokemon/gen1/SquirtleModel.kt | 4 +- .../blockbench/pokemon/gen1/TaurosModel.kt | 4 +- .../blockbench/pokemon/gen1/TentacoolModel.kt | 2 +- .../pokemon/gen1/TentacruelModel.kt | 2 +- .../blockbench/pokemon/gen1/VaporeonModel.kt | 2 +- .../blockbench/pokemon/gen1/VenusaurModel.kt | 4 +- .../blockbench/pokemon/gen1/VileplumeModel.kt | 2 +- .../blockbench/pokemon/gen1/VoltorbModel.kt | 2 +- .../pokemon/gen1/VulpixAlolanModel.kt | 2 +- .../blockbench/pokemon/gen1/VulpixModel.kt | 2 +- .../blockbench/pokemon/gen1/WartortleModel.kt | 4 +- .../blockbench/pokemon/gen1/WeedleModel.kt | 4 +- .../blockbench/pokemon/gen1/WeezingModel.kt | 4 +- .../pokemon/gen1/WigglytuffModel.kt | 2 +- .../blockbench/pokemon/gen1/ZubatModel.kt | 4 +- .../blockbench/pokemon/gen2/AipomModel.kt | 4 +- .../blockbench/pokemon/gen2/AmpharosModel.kt | 8 +-- .../blockbench/pokemon/gen2/BayleefModel.kt | 4 +- .../blockbench/pokemon/gen2/BellossomModel.kt | 2 +- .../blockbench/pokemon/gen2/ChikoritaModel.kt | 4 +- .../blockbench/pokemon/gen2/ChinchouModel.kt | 2 +- .../blockbench/pokemon/gen2/CleffaModel.kt | 4 +- .../blockbench/pokemon/gen2/CrobatModel.kt | 4 +- .../blockbench/pokemon/gen2/CroconawModel.kt | 4 +- .../blockbench/pokemon/gen2/CyndaquilModel.kt | 4 +- .../blockbench/pokemon/gen2/DonphanModel.kt | 2 +- .../blockbench/pokemon/gen2/ElekidModel.kt | 2 +- .../blockbench/pokemon/gen2/EspeonModel.kt | 4 +- .../pokemon/gen2/FeraligatrModel.kt | 4 +- .../blockbench/pokemon/gen2/FlaaffyModel.kt | 4 +- .../pokemon/gen2/ForretressModel.kt | 2 +- .../blockbench/pokemon/gen2/GligarModel.kt | 2 +- .../blockbench/pokemon/gen2/GranbullModel.kt | 4 +- .../blockbench/pokemon/gen2/HitmontopModel.kt | 4 +- .../blockbench/pokemon/gen2/HoothootModel.kt | 6 +- .../blockbench/pokemon/gen2/IgglybuffModel.kt | 2 +- .../blockbench/pokemon/gen2/KingdraModel.kt | 2 +- .../blockbench/pokemon/gen2/LanturnModel.kt | 2 +- .../blockbench/pokemon/gen2/MagcargoModel.kt | 2 +- .../pokemon/gen2/MagcargoShinyModel.kt | 2 +- .../blockbench/pokemon/gen2/MareepModel.kt | 4 +- .../blockbench/pokemon/gen2/MeganiumModel.kt | 4 +- .../blockbench/pokemon/gen2/MiltankModel.kt | 4 +- .../pokemon/gen2/MisdreavusModel.kt | 2 +- .../blockbench/pokemon/gen2/MurkrowModel.kt | 2 +- .../blockbench/pokemon/gen2/NatuModel.kt | 2 +- .../blockbench/pokemon/gen2/NoctowlModel.kt | 4 +- .../blockbench/pokemon/gen2/PhanpyModel.kt | 2 +- .../blockbench/pokemon/gen2/PichuModel.kt | 4 +- .../blockbench/pokemon/gen2/PinecoModel.kt | 2 +- .../blockbench/pokemon/gen2/Porygon2Model.kt | 2 +- .../blockbench/pokemon/gen2/QuagsireModel.kt | 4 +- .../blockbench/pokemon/gen2/QuilavaModel.kt | 5 +- .../blockbench/pokemon/gen2/ScizorModel.kt | 2 +- .../blockbench/pokemon/gen2/ShuckleModel.kt | 2 +- .../blockbench/pokemon/gen2/SlowkingModel.kt | 4 +- .../blockbench/pokemon/gen2/SlugmaModel.kt | 2 +- .../pokemon/gen2/SlugmaShinyModel.kt | 2 +- .../blockbench/pokemon/gen2/SmoochumModel.kt | 2 +- .../blockbench/pokemon/gen2/SneaselModel.kt | 2 +- .../blockbench/pokemon/gen2/SnubbullModel.kt | 2 +- .../blockbench/pokemon/gen2/StantlerModel.kt | 2 +- .../blockbench/pokemon/gen2/SteelixModel.kt | 6 +- .../blockbench/pokemon/gen2/SudowoodoModel.kt | 2 +- .../blockbench/pokemon/gen2/TeddiursaModel.kt | 4 +- .../blockbench/pokemon/gen2/TotodileModel.kt | 8 +-- .../pokemon/gen2/TyphlosionModel.kt | 4 +- .../blockbench/pokemon/gen2/TyrogueModel.kt | 4 +- .../blockbench/pokemon/gen2/UmbreonModel.kt | 4 +- .../blockbench/pokemon/gen2/UrsaringModel.kt | 2 +- .../blockbench/pokemon/gen2/WooperModel.kt | 4 +- .../pokemon/gen2/WooperPaldeanModel.kt | 4 +- .../blockbench/pokemon/gen2/XatuModel.kt | 2 +- .../blockbench/pokemon/gen3/BarboachModel.kt | 2 +- .../blockbench/pokemon/gen3/BeldumModel.kt | 6 +- .../blockbench/pokemon/gen3/BlazikenModel.kt | 4 +- .../blockbench/pokemon/gen3/BreloomModel.kt | 4 +- .../blockbench/pokemon/gen3/CacneaModel.kt | 2 +- .../blockbench/pokemon/gen3/CacturneModel.kt | 2 +- .../blockbench/pokemon/gen3/CameruptModel.kt | 2 +- .../blockbench/pokemon/gen3/ChimechoModel.kt | 2 +- .../blockbench/pokemon/gen3/ClaydolModel.kt | 2 +- .../blockbench/pokemon/gen3/CombuskenModel.kt | 4 +- .../blockbench/pokemon/gen3/DusclopsModel.kt | 2 +- .../blockbench/pokemon/gen3/GardevoirModel.kt | 4 +- .../blockbench/pokemon/gen3/GrovyleModel.kt | 4 +- .../blockbench/pokemon/gen3/IllumiseModel.kt | 2 +- .../blockbench/pokemon/gen3/KirliaModel.kt | 4 +- .../pokemon/gen3/LinooneGalarianModel.kt | 2 +- .../blockbench/pokemon/gen3/LinooneModel.kt | 2 +- .../blockbench/pokemon/gen3/LombreModel.kt | 2 +- .../blockbench/pokemon/gen3/LotadModel.kt | 2 +- .../blockbench/pokemon/gen3/LudicoloModel.kt | 2 +- .../blockbench/pokemon/gen3/LuvdiscModel.kt | 2 +- .../blockbench/pokemon/gen3/MarshtompModel.kt | 4 +- .../pokemon/gen3/MasquerainModel.kt | 2 +- .../blockbench/pokemon/gen3/MawileModel.kt | 2 +- .../blockbench/pokemon/gen3/MetagrossModel.kt | 4 +- .../blockbench/pokemon/gen3/MetangModel.kt | 4 +- .../blockbench/pokemon/gen3/MightyenaModel.kt | 10 ++-- .../blockbench/pokemon/gen3/MinunModel.kt | 2 +- .../blockbench/pokemon/gen3/MudkipModel.kt | 4 +- .../blockbench/pokemon/gen3/NincadaModel.kt | 6 +- .../blockbench/pokemon/gen3/NinjaskModel.kt | 6 +- .../blockbench/pokemon/gen3/NumelModel.kt | 2 +- .../blockbench/pokemon/gen3/NuzleafModel.kt | 2 +- .../blockbench/pokemon/gen3/PelipperModel.kt | 2 +- .../blockbench/pokemon/gen3/PlusleModel.kt | 2 +- .../blockbench/pokemon/gen3/PoochyenaModel.kt | 4 +- .../blockbench/pokemon/gen3/RaltsModel.kt | 4 +- .../blockbench/pokemon/gen3/SceptileModel.kt | 4 +- .../blockbench/pokemon/gen3/SeedotModel.kt | 2 +- .../blockbench/pokemon/gen3/ShedinjaModel.kt | 4 +- .../blockbench/pokemon/gen3/ShiftryModel.kt | 2 +- .../blockbench/pokemon/gen3/ShroomishModel.kt | 4 +- .../blockbench/pokemon/gen3/SurskitModel.kt | 2 +- .../blockbench/pokemon/gen3/SwampertModel.kt | 4 +- .../blockbench/pokemon/gen3/SwellowModel.kt | 4 +- .../blockbench/pokemon/gen3/TaillowModel.kt | 4 +- .../blockbench/pokemon/gen3/TorchicModel.kt | 4 +- .../blockbench/pokemon/gen3/TreeckoModel.kt | 4 +- .../blockbench/pokemon/gen3/VolbeatModel.kt | 2 +- .../blockbench/pokemon/gen3/WailordModel.kt | 2 +- .../blockbench/pokemon/gen3/WingullModel.kt | 2 +- .../pokemon/gen3/ZigzagoonGalarianModel.kt | 2 +- .../blockbench/pokemon/gen3/ZigzagoonModel.kt | 2 +- .../blockbench/pokemon/gen4/AmbipomModel.kt | 4 +- .../blockbench/pokemon/gen4/BibarelModel.kt | 2 +- .../blockbench/pokemon/gen4/BidoofModel.kt | 2 +- .../blockbench/pokemon/gen4/BonslyModel.kt | 2 +- .../blockbench/pokemon/gen4/BuizelModel.kt | 2 +- .../blockbench/pokemon/gen4/BunearyModel.kt | 4 +- .../blockbench/pokemon/gen4/CarnivineModel.kt | 2 +- .../blockbench/pokemon/gen4/ChatotModel.kt | 4 +- .../blockbench/pokemon/gen4/ChimcharModel.kt | 4 +- .../blockbench/pokemon/gen4/ChinglingModel.kt | 6 +- .../blockbench/pokemon/gen4/CombeeModel.kt | 6 +- .../blockbench/pokemon/gen4/DrifblimModel.kt | 2 +- .../blockbench/pokemon/gen4/DrifloonModel.kt | 2 +- .../blockbench/pokemon/gen4/DusknoirModel.kt | 2 +- .../pokemon/gen4/ElectivireModel.kt | 2 +- .../blockbench/pokemon/gen4/EmpoleonModel.kt | 4 +- .../blockbench/pokemon/gen4/FloatzelModel.kt | 2 +- .../blockbench/pokemon/gen4/GabiteModel.kt | 2 +- .../blockbench/pokemon/gen4/GalladeModel.kt | 7 ++- .../blockbench/pokemon/gen4/GarchompModel.kt | 2 +- .../blockbench/pokemon/gen4/GibleModel.kt | 2 +- .../blockbench/pokemon/gen4/GlaceonModel.kt | 4 +- .../blockbench/pokemon/gen4/GliscorModel.kt | 2 +- .../blockbench/pokemon/gen4/GrotleModel.kt | 6 +- .../blockbench/pokemon/gen4/HonchkrowModel.kt | 2 +- .../blockbench/pokemon/gen4/InfernapeModel.kt | 4 +- .../blockbench/pokemon/gen4/KricketotModel.kt | 2 +- .../pokemon/gen4/KricketuneModel.kt | 2 +- .../blockbench/pokemon/gen4/LeafeonModel.kt | 4 +- .../pokemon/gen4/LickilickyModel.kt | 2 +- .../blockbench/pokemon/gen4/LopunnyModel.kt | 4 +- .../blockbench/pokemon/gen4/LucarioModel.kt | 4 +- .../blockbench/pokemon/gen4/LuxioModel.kt | 2 +- .../blockbench/pokemon/gen4/LuxrayModel.kt | 2 +- .../blockbench/pokemon/gen4/MagnezoneModel.kt | 2 +- .../blockbench/pokemon/gen4/MamoswineModel.kt | 2 +- .../blockbench/pokemon/gen4/MimejrModel.kt | 2 +- .../blockbench/pokemon/gen4/MismagiusModel.kt | 2 +- .../blockbench/pokemon/gen4/MonfernoModel.kt | 4 +- .../blockbench/pokemon/gen4/MunchlaxModel.kt | 2 +- .../blockbench/pokemon/gen4/PachirisuModel.kt | 2 +- .../blockbench/pokemon/gen4/PiplupModel.kt | 4 +- .../blockbench/pokemon/gen4/PorygonzModel.kt | 14 ++--- .../blockbench/pokemon/gen4/PrinplupModel.kt | 4 +- .../blockbench/pokemon/gen4/ProbopassModel.kt | 2 +- .../blockbench/pokemon/gen4/RioluModel.kt | 4 +- .../blockbench/pokemon/gen4/ShinxModel.kt | 2 +- .../blockbench/pokemon/gen4/StaraptorModel.kt | 2 +- .../blockbench/pokemon/gen4/StaraviaModel.kt | 4 +- .../blockbench/pokemon/gen4/StarlyModel.kt | 2 +- .../blockbench/pokemon/gen4/TangrowthModel.kt | 2 +- .../pokemon/gen4/TorterraCherryModel.kt | 4 +- .../blockbench/pokemon/gen4/TorterraModel.kt | 4 +- .../blockbench/pokemon/gen4/TurtwigModel.kt | 4 +- .../blockbench/pokemon/gen4/VespiquenModel.kt | 4 +- .../blockbench/pokemon/gen4/WeavileModel.kt | 2 +- .../blockbench/pokemon/gen5/BoldoreModel.kt | 2 +- .../pokemon/gen5/BouffalantModel.kt | 2 +- .../pokemon/gen5/ChandelureModel.kt | 2 +- .../pokemon/gen5/CofagrigusModel.kt | 4 +- .../pokemon/gen5/ConkeldurrModel.kt | 2 +- .../blockbench/pokemon/gen5/CottoneeModel.kt | 4 +- .../blockbench/pokemon/gen5/CrustleModel.kt | 2 +- .../blockbench/pokemon/gen5/CryogonalModel.kt | 2 +- .../blockbench/pokemon/gen5/DewottModel.kt | 4 +- .../blockbench/pokemon/gen5/DurantModel.kt | 2 +- .../blockbench/pokemon/gen5/DwebbleModel.kt | 2 +- .../blockbench/pokemon/gen5/EmboarModel.kt | 4 +- .../blockbench/pokemon/gen5/EmolgaModel.kt | 2 +- .../pokemon/gen5/GalvantulaModel.kt | 4 +- .../blockbench/pokemon/gen5/GigalithModel.kt | 2 +- .../blockbench/pokemon/gen5/GolettModel.kt | 2 +- .../blockbench/pokemon/gen5/GolurkModel.kt | 2 +- .../blockbench/pokemon/gen5/GurdurrModel.kt | 2 +- .../blockbench/pokemon/gen5/HeatmorModel.kt | 2 +- .../blockbench/pokemon/gen5/HerdierModel.kt | 4 +- .../blockbench/pokemon/gen5/JoltikModel.kt | 4 +- .../blockbench/pokemon/gen5/LampentModel.kt | 2 +- .../blockbench/pokemon/gen5/LillipupModel.kt | 4 +- .../blockbench/pokemon/gen5/LitwickModel.kt | 2 +- .../blockbench/pokemon/gen5/MaractusModel.kt | 4 +- .../blockbench/pokemon/gen5/OshawottModel.kt | 4 +- .../blockbench/pokemon/gen5/PatratModel.kt | 4 +- .../blockbench/pokemon/gen5/PidoveModel.kt | 4 +- .../blockbench/pokemon/gen5/PigniteModel.kt | 4 +- .../pokemon/gen5/RoggenrolaModel.kt | 4 +- .../blockbench/pokemon/gen5/SamurottModel.kt | 4 +- .../blockbench/pokemon/gen5/ScolipedeModel.kt | 4 +- .../blockbench/pokemon/gen5/SerperiorModel.kt | 4 +- .../blockbench/pokemon/gen5/ServineModel.kt | 4 +- .../blockbench/pokemon/gen5/SnivyModel.kt | 4 +- .../blockbench/pokemon/gen5/StoutlandModel.kt | 4 +- .../blockbench/pokemon/gen5/TepigModel.kt | 4 +- .../blockbench/pokemon/gen5/TimburrModel.kt | 2 +- .../blockbench/pokemon/gen5/TranquillModel.kt | 4 +- .../blockbench/pokemon/gen5/UnfezantModel.kt | 4 +- .../blockbench/pokemon/gen5/VenipedeModel.kt | 6 +- .../blockbench/pokemon/gen5/WatchogModel.kt | 4 +- .../pokemon/gen5/WhimsicottModel.kt | 4 +- .../pokemon/gen5/WhirlipedeModel.kt | 4 +- .../blockbench/pokemon/gen5/YamaskModel.kt | 4 +- .../blockbench/pokemon/gen6/AegislashModel.kt | 4 +- .../blockbench/pokemon/gen6/AvaluggModel.kt | 4 +- .../blockbench/pokemon/gen6/BergmiteModel.kt | 4 +- .../blockbench/pokemon/gen6/BraixenModel.kt | 4 +- .../blockbench/pokemon/gen6/BunnelbyModel.kt | 8 +-- .../pokemon/gen6/ChesnaughtModel.kt | 4 +- .../blockbench/pokemon/gen6/ChespinModel.kt | 4 +- .../blockbench/pokemon/gen6/DelphoxModel.kt | 4 +- .../blockbench/pokemon/gen6/DiggersbyModel.kt | 4 +- .../blockbench/pokemon/gen6/DoubladeModel.kt | 4 +- .../blockbench/pokemon/gen6/DragalgeModel.kt | 4 +- .../blockbench/pokemon/gen6/FennekinModel.kt | 4 +- .../pokemon/gen6/FletchinderModel.kt | 4 +- .../pokemon/gen6/FletchlingModel.kt | 4 +- .../blockbench/pokemon/gen6/FroakieModel.kt | 4 +- .../blockbench/pokemon/gen6/FrogadierModel.kt | 4 +- .../blockbench/pokemon/gen6/GourgeistModel.kt | 4 +- .../blockbench/pokemon/gen6/GreninjaModel.kt | 4 +- .../blockbench/pokemon/gen6/HonedgeModel.kt | 4 +- .../blockbench/pokemon/gen6/PhantumpModel.kt | 4 +- .../blockbench/pokemon/gen6/PumpkabooModel.kt | 4 +- .../blockbench/pokemon/gen6/QuilladinModel.kt | 4 +- .../pokemon/gen6/ScatterbugModel.kt | 6 +- .../blockbench/pokemon/gen6/SkrelpModel.kt | 4 +- .../blockbench/pokemon/gen6/SpewpaModel.kt | 6 +- .../blockbench/pokemon/gen6/SylveonModel.kt | 4 +- .../pokemon/gen6/TalonflameModel.kt | 4 +- .../blockbench/pokemon/gen6/TrevenantModel.kt | 4 +- .../blockbench/pokemon/gen6/VivillonModel.kt | 4 +- .../blockbench/pokemon/gen7/BewearModel.kt | 4 +- .../blockbench/pokemon/gen7/BrionneModel.kt | 4 +- .../blockbench/pokemon/gen7/ComfeyModel.kt | 2 +- .../blockbench/pokemon/gen7/DartrixModel.kt | 2 +- .../blockbench/pokemon/gen7/DecidueyeModel.kt | 4 +- .../blockbench/pokemon/gen7/GolisopodModel.kt | 4 +- .../pokemon/gen7/IncineroarModel.kt | 4 +- .../blockbench/pokemon/gen7/KomalaModel.kt | 4 +- .../blockbench/pokemon/gen7/LittenModel.kt | 4 +- .../blockbench/pokemon/gen7/MimikyuModel.kt | 2 +- .../blockbench/pokemon/gen7/MorelullModel.kt | 2 +- .../blockbench/pokemon/gen7/MudbrayModel.kt | 4 +- .../blockbench/pokemon/gen7/MudsdaleModel.kt | 4 +- .../blockbench/pokemon/gen7/PoipoleModel.kt | 2 +- .../blockbench/pokemon/gen7/PopplioModel.kt | 4 +- .../blockbench/pokemon/gen7/PrimarinaModel.kt | 4 +- .../blockbench/pokemon/gen7/RowletModel.kt | 4 +- .../blockbench/pokemon/gen7/ShiinoticModel.kt | 2 +- .../blockbench/pokemon/gen7/SteeneeModel.kt | 2 +- .../blockbench/pokemon/gen7/StuffulModel.kt | 4 +- .../blockbench/pokemon/gen7/TorracatModel.kt | 4 +- .../blockbench/pokemon/gen7/TsareenaModel.kt | 2 +- .../blockbench/pokemon/gen7/WimpodModel.kt | 8 +-- .../pokemon/gen7/WishiwashiSoloModel.kt | 2 +- .../blockbench/pokemon/gen8/AlcremieModel.kt | 2 +- .../blockbench/pokemon/gen8/ArrokudaModel.kt | 4 +- .../pokemon/gen8/BarraskewdaModel.kt | 2 +- .../blockbench/pokemon/gen8/BoltundModel.kt | 4 +- .../blockbench/pokemon/gen8/CinderaceModel.kt | 4 +- .../pokemon/gen8/CorviknightModel.kt | 4 +- .../pokemon/gen8/CorvisquireModel.kt | 4 +- .../blockbench/pokemon/gen8/DrizzileModel.kt | 4 +- .../blockbench/pokemon/gen8/DubwoolModel.kt | 4 +- .../blockbench/pokemon/gen8/EiscueModel.kt | 2 +- .../blockbench/pokemon/gen8/FalinksModel.kt | 12 ++-- .../blockbench/pokemon/gen8/GrookeyModel.kt | 4 +- .../blockbench/pokemon/gen8/InteleonModel.kt | 4 +- .../blockbench/pokemon/gen8/KleavorModel.kt | 2 +- .../blockbench/pokemon/gen8/NickitModel.kt | 12 ++-- .../blockbench/pokemon/gen8/ObstagoonModel.kt | 2 +- .../pokemon/gen8/PerrserkerModel.kt | 2 +- .../blockbench/pokemon/gen8/RabootModel.kt | 4 +- .../blockbench/pokemon/gen8/RillaboomModel.kt | 4 +- .../blockbench/pokemon/gen8/RookideeModel.kt | 4 +- .../blockbench/pokemon/gen8/ScorbunnyModel.kt | 4 +- .../blockbench/pokemon/gen8/SirfetchdModel.kt | 7 ++- .../blockbench/pokemon/gen8/SobbleModel.kt | 4 +- .../blockbench/pokemon/gen8/ThievulModel.kt | 6 +- .../blockbench/pokemon/gen8/ThwackeyModel.kt | 4 +- .../blockbench/pokemon/gen8/UrsalunaModel.kt | 4 +- .../blockbench/pokemon/gen8/WoolooModel.kt | 4 +- .../blockbench/pokemon/gen8/WyrdeerModel.kt | 2 +- .../blockbench/pokemon/gen8/YamperModel.kt | 4 +- .../pokemon/gen9/AnnihilapeModel.kt | 4 +- .../blockbench/pokemon/gen9/ArmarougeModel.kt | 4 +- .../blockbench/pokemon/gen9/CeruledgeModel.kt | 4 +- .../blockbench/pokemon/gen9/CetitanModel.kt | 4 +- .../blockbench/pokemon/gen9/CetoddleModel.kt | 4 +- .../blockbench/pokemon/gen9/CharcadetModel.kt | 4 +- .../blockbench/pokemon/gen9/ClodsireModel.kt | 4 +- .../blockbench/pokemon/gen9/CrocalorModel.kt | 4 +- .../blockbench/pokemon/gen9/DachsbunModel.kt | 4 +- .../blockbench/pokemon/gen9/EspathraModel.kt | 4 +- .../blockbench/pokemon/gen9/FidoughModel.kt | 4 +- .../blockbench/pokemon/gen9/FlittleModel.kt | 4 +- .../blockbench/pokemon/gen9/FloragatoModel.kt | 4 +- .../blockbench/pokemon/gen9/FuecocoModel.kt | 4 +- .../blockbench/pokemon/gen9/GarganaclModel.kt | 2 +- .../blockbench/pokemon/gen9/GlimmetModel.kt | 4 +- .../blockbench/pokemon/gen9/GlimmoraModel.kt | 4 +- .../blockbench/pokemon/gen9/GrafaiaiModel.kt | 4 +- .../pokemon/gen9/IronleavesModel.kt | 2 +- .../blockbench/pokemon/gen9/LechonkModel.kt | 2 +- .../pokemon/gen9/MabosstiffModel.kt | 4 +- .../blockbench/pokemon/gen9/MaschiffModel.kt | 4 +- .../blockbench/pokemon/gen9/MausholdModel.kt | 6 +- .../pokemon/gen9/MausholdfourModel.kt | 8 +-- .../pokemon/gen9/MeowscaradaModel.kt | 12 ++-- .../blockbench/pokemon/gen9/NacliModel.kt | 2 +- .../blockbench/pokemon/gen9/NaclstackModel.kt | 2 +- .../pokemon/gen9/OinkologneModel.kt | 2 +- .../blockbench/pokemon/gen9/QuaquavalModel.kt | 4 +- .../blockbench/pokemon/gen9/QuaxlyModel.kt | 4 +- .../blockbench/pokemon/gen9/QuaxwellModel.kt | 4 +- .../blockbench/pokemon/gen9/RevavroomModel.kt | 4 +- .../blockbench/pokemon/gen9/ShroodleModel.kt | 4 +- .../pokemon/gen9/SkeledirgeModel.kt | 4 +- .../pokemon/gen9/SprigatitoModel.kt | 8 +-- .../pokemon/gen9/SquawkabillyModel.kt | 4 +- .../blockbench/pokemon/gen9/TandemausModel.kt | 6 +- .../blockbench/pokemon/gen9/TatsugiriModel.kt | 2 +- .../blockbench/pokemon/gen9/TinkatinkModel.kt | 4 +- .../blockbench/pokemon/gen9/TinkatonModel.kt | 4 +- .../blockbench/pokemon/gen9/TinkatuffModel.kt | 4 +- .../blockbench/pokemon/gen9/VaroomModel.kt | 4 +- .../pokemon/gen9/WalkingwakeModel.kt | 2 +- .../render/models/blockbench/pose/Pose.kt | 4 +- .../models/blockbench/quirk/QuirkData.kt | 5 ++ .../models/blockbench/quirk/SimpleQuirk.kt | 18 +++++- .../blockbench/wavefunction/WaveFunction.kt | 25 ++++++++ .../render/pokeball/PokeBallPoseableState.kt | 8 +-- .../mod/common/util/JsonExtensions.kt | 9 +++ utilityscripts/cobblemon_cry_checker.py | 2 +- 480 files changed, 924 insertions(+), 863 deletions(-) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt index c2b07dc34b..dc37c46d46 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt @@ -63,7 +63,7 @@ class PokemonClientDelegate : PoseableEntityState(), PokemonSideD if (it) { val model = (currentModel ?: return@subscribe) as PokemonPoseableModel val animation = model.getAnimation(this, "faint", runtime) ?: return@subscribe - val primaryAnimation = PrimaryAnimation(animation) + val primaryAnimation = if (animation is PrimaryAnimation) animation else PrimaryAnimation(animation, curve = { 1F }) after(seconds = 3F) { entityScaleModifier = 0F } this.addPrimaryAnimation(primaryAnimation) } @@ -158,12 +158,16 @@ class PokemonClientDelegate : PoseableEntityState(), PokemonSideD fun cry() { val model = currentModel ?: return if (model is PokemonPoseableModel) { - if (cryAnimation != null && cryAnimation in statefulAnimations) { + if (cryAnimation != null && (cryAnimation in statefulAnimations || cryAnimation == primaryAnimation)) { return } val animation = model.cryAnimation(currentEntity, this) ?: return - statefulAnimations.add(animation) + if (animation is PrimaryAnimation) { + addPrimaryAnimation(animation) + } else { + statefulAnimations.add(animation) + } cryAnimation = animation } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt index 2ceeeeb4e0..0e0747963b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt @@ -35,6 +35,6 @@ object BedrockAnimationReferenceFactory : AnimationReferenceFactory { return model.bedrockStateful( animationGroup = split[0], animation = split[1] - ).setPreventsIdle(if (split.size == 3) split[2].toBoolean() else JsonPokemonPoseableModel.StatefulAnimationAdapter.preventsIdleDefault) + ) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt index cc89f92e2f..e4b4df8bf4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt @@ -101,8 +101,6 @@ abstract class PoseableEntityModel( /** Gets the [PoseableEntityState] for an entity. */ abstract fun getState(entity: T): PoseableEntityState - fun getChangeFactor(part: ModelPart) = relevantParts.find { it.modelPart === part }?.changeFactor ?: 1F - fun scaleForPart(part: ModelPart, value: Float) = getChangeFactor(part) * value fun getAnimation(state: PoseableEntityState<*>, name: String, runtime: MoLangRuntime): StatefulAnimation? { val poseAnimations = state.currentPose?.let(this::getPose)?.animations ?: mapOf() val animation = resolveFromAnimationMap(poseAnimations, name, runtime) ?: resolveFromAnimationMap(animations, name, runtime) @@ -512,7 +510,7 @@ abstract class PoseableEntityModel( .filterNot { it.run(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, 1F) } state.statefulAnimations.removeAll(removedStatefuls) state.currentPose?.let { getPose(it) } - ?.idleStateful(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, state.primaryOverridePortion) + ?.idleStateful(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch) updateLocators(state) } @@ -631,11 +629,9 @@ abstract class PoseableEntityModel( fun bedrockStateful( animationGroup: String, animation: String, - animationPrefix: String = "animation.$animationGroup", - preventsIdleCheck: (T?, PoseableEntityState, StatelessAnimation) -> Boolean = { _, _, _ -> true } - ) = BedrockStatefulAnimation( + animationPrefix: String = "animation.$animationGroup" + ) = BedrockStatefulAnimation( BedrockAnimationRepository.getAnimation(animationGroup, "$animationPrefix.$animation"), - preventsIdleCheck ) fun quirk( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt index 1a60b07247..e4d3a59faa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt @@ -34,6 +34,8 @@ import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk import com.cobblemon.mod.common.client.render.models.blockbench.quirk.QuirkData +import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction +import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions import com.cobblemon.mod.common.entity.Poseable import com.cobblemon.mod.common.util.asExpression import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace @@ -66,27 +68,40 @@ abstract class PoseableEntityState : Schedulable { val reusableAnimTime = DoubleValue(0.0) // This gets called 500 million times so use a mutable value for runtime runtime.environment.getQueryStruct().addFunctions(mapOf( "anim_time" to java.util.function.Function { return@Function reusableAnimTime.also { it.value = animationSeconds.toDouble() } }, + "bedrock_primary" to java.util.function.Function { params -> + val group = params.getString(0) + val animation = params.getString(1) + val anim = currentModel?.bedrockStateful(group, animation) ?: return@Function ObjectValue(0) + val excludedLabels = mutableSetOf() + var curve: WaveFunction = { t -> + if (t < 0.1) { + t * 10 + } else if (t < 0.9) { + 1F + } else { + 1F + } + } + for (index in 2 until params.params.size) { + val label = params.getString(index) ?: continue + val regex = "curve[ =]+([a-zA-Z0-9]+)".toRegex() + val curveName = regex.find(label) + if (curveName != null && curveName.groupValues.size > 1) { + val curveId = curveName.groupValues[1] + WaveFunctions.functions[curveId]?.let { curve = it } + } else { + excludedLabels.add(label) + } + + } + + return@Function ObjectValue(PrimaryAnimation(animation = anim, excludedLabels = excludedLabels, curve = curve)) + }, "bedrock_stateful" to java.util.function.Function { params -> val group = params.getString(0) val animation = params.getString(1) - var preventsIdle = false - var posePauser = false - for (i in 2 until params.params.size) { - val value = params.getString(i).lowercase() - if (value.equals("prevents_idle")) { - preventsIdle = true - } else if (value == "pauses_pose") { - posePauser = true - } - } val anim = currentModel?.bedrockStateful(group, animation) ?: return@Function ObjectValue(0) - anim.setPreventsIdle(preventsIdle) - anim.isPosePauserAnimation(posePauser) - return@Function ObjectValue(anim).addFunction( - "prevents_idle", java.util.function.Function { anim.setPreventsIdle(it.getString(0).toBoolean()) } - ).addFunction( - "pauses_pose", java.util.function.Function { anim.isPosePauserAnimation = it.getString(0).toBoolean() } - ) + return@Function ObjectValue(anim) }, "pose_type" to java.util.function.Function { return@Function StringValue((getEntity() as Poseable).getPoseType().name) }, "pose" to java.util.function.Function { _ -> return@Function StringValue(currentPose ?: "") }, @@ -216,7 +231,11 @@ abstract class PoseableEntityState : Schedulable { fun addFirstAnimation(animation: Set) { val model = currentModel ?: return val animation = animation.firstNotNullOfOrNull { model.getAnimation(this, it, runtime) } ?: return - statefulAnimations.add(animation) + if (animation is PrimaryAnimation) { + addPrimaryAnimation(animation) + } else { + addStatefulAnimation(animation) + } } fun isPosedIn(vararg poses: Pose) = poses.any { it.poseName == currentPose } @@ -298,7 +317,7 @@ abstract class PoseableEntityState : Schedulable { fun shouldIdleRun(idleAnimation: StatelessAnimation, requiredIntensity: Float): Boolean { val primaryAnimation = primaryAnimation return if (primaryAnimation != null) { - !primaryAnimation.prevents(idleAnimation) && this.primaryOverridePortion >= requiredIntensity + !primaryAnimation.prevents(idleAnimation) || this.primaryOverridePortion > requiredIntensity } else { true } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt index 65908a29aa..2da7951993 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt @@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.animation import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction import net.minecraft.entity.Entity @@ -34,11 +35,12 @@ class PrimaryAnimation( } }, val excludedLabels: Set = emptySet(), -) { - val duration = animation.duration + override val isTransform: Boolean = false +): StatefulAnimation { var started = -1F + override val duration: Float = animation.duration - fun run( + override fun run( entity: T?, model: PoseableEntityModel, state: PoseableEntityState, @@ -47,9 +49,9 @@ class PrimaryAnimation( ageInTicks: Float, headYaw: Float, headPitch: Float, - severity: Float + intensity: Float ): Boolean { - return animation.run(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, severity) + return animation.run(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity) } fun prevents(idleAnimation: StatelessAnimation) = idleAnimation.labels.intersect(excludedLabels).isEmpty() && "all" !in excludedLabels diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt index 7523a38a54..acbefecfaa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt @@ -24,13 +24,7 @@ import net.minecraft.entity.Entity */ open class BedrockStatefulAnimation( val animation: BedrockAnimation, - var preventsIdleCheck: (T?, PoseableEntityState, StatelessAnimation) -> Boolean ) : StatefulAnimation { - fun setPreventsIdle(preventsIdle: Boolean): BedrockStatefulAnimation { - this.preventsIdleCheck = { _, _, _ -> preventsIdle } - return this - } - var startedSeconds = -1F var isTransformAnimation = false override val duration = if (!animation.shouldLoop) animation.animationLength.toFloat() else -1F @@ -39,10 +33,6 @@ open class BedrockStatefulAnimation( override val isTransform: Boolean get() = isTransformAnimation - fun isTransformAnimation(value: Boolean) = this.also { - it.isTransformAnimation = value - } - fun andThen(action: (entity: T, PoseableEntityState) -> Unit) = this.also { it.afterAction = action } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt index 095719ace4..48b7a11a2b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt @@ -56,8 +56,8 @@ class PokeBallModel(root: ModelPart) : PoseableEntityModel( transformTicks = 0 ) - shut.transitions[open] = { _, _ -> bedrockStateful("poke_ball", "open").isTransformAnimation(true) } - open.transitions[shut] = { _, _ -> bedrockStateful("poke_ball", "shut").isTransformAnimation(true) } + shut.transitions[open] = { _, _ -> bedrockStateful("poke_ball", "open") } + open.transitions[shut] = { _, _ -> bedrockStateful("poke_ball", "shut") } midair.transitions[open] = shut.transitions[open]!! } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt index 9d91449213..d476bdf09e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt @@ -22,6 +22,7 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter import com.cobblemon.mod.common.util.adapters.Vec3dAdapter import com.cobblemon.mod.common.util.asExpressionLike +import com.cobblemon.mod.common.util.getFirst import com.google.gson.* import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken @@ -100,7 +101,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod val cry: Supplier>? = null override fun getFaintAnimation(pokemonEntity: PokemonEntity, state: PoseableEntityState) = faint?.get() - override val cryAnimation = CryProvider { _, _ -> cry?.get()?.also { if (it is BedrockStatefulAnimation) it.setPreventsIdle(false) } } + override val cryAnimation = CryProvider { _, _ -> cry?.get() } object JsonModelExclusion: ExclusionStrategy { override fun shouldSkipField(f: FieldAttributes): Boolean { @@ -118,7 +119,6 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod } object StatefulAnimationAdapter : JsonDeserializer>> { - var preventsIdleDefault = true override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): Supplier> { json as JsonPrimitive val animString = json.asString @@ -137,6 +137,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod } } } + object PoseAdapter : JsonDeserializer> { override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): Pose { val model = JsonPokemonPoseableModelAdapter.model!! @@ -150,7 +151,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod val conditionsList = mutableListOf<(PokemonEntity) -> Boolean>() - val animations = json.get("animations")?.asJsonObject?.let { + val animations = json.get("namedAnimations")?.takeIf { it is JsonObject }?.asJsonObject?.let { val map = mutableMapOf() for ((key, value) in it.entrySet()) { map[key] = value.asString.asExpressionLike() @@ -179,7 +180,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod return@map transformation.withPosition(position.x, position.y, position.z).withRotationDegrees(rotation.x, rotation.y, rotation.z).withVisibility(isVisible) }?.toTypedArray() ?: arrayOf() - val idleAnimations = (obj.get("animations")?.asJsonArray ?: JsonArray()).asJsonArray.mapNotNull { + val idleAnimations = (json.getFirst("idleAnimations", "animations")?.takeIf { it is JsonArray }?.asJsonArray?.mapNotNull { val animString = it.asString if (animString == "look") { return@mapNotNull JsonPokemonPoseableModelAdapter.model!!.singleBoneLook() @@ -191,7 +192,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod } } return@mapNotNull null - }.toTypedArray() + }?.toTypedArray() ?: arrayOf()) val quirks = (obj.get("quirks")?.asJsonArray ?: JsonArray()).map { json -> json as JsonObject @@ -199,16 +200,12 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod val animations: (state: PoseableEntityState) -> List> = { _ -> (json.get("animations")?.asJsonArray ?: JsonArray()).map { animJson -> val animString = animJson.asString - val anim = animString.substringBefore("(") - - StatefulAnimationAdapter.preventsIdleDefault = false val animation = if(ANIMATION_FACTORIES.contains(anim)) { ANIMATION_FACTORIES[anim]?.stateful(model, animString) } else { null } - StatefulAnimationAdapter.preventsIdleDefault = true animation }.filterNotNull() } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt index 89ed2ced02..335dfe10bb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt @@ -33,7 +33,7 @@ class AerodactylModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("aerodactyl", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("aerodactyl", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("aerodactyl", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt index 93ea5b1eef..776a485b1d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt @@ -41,7 +41,7 @@ class AlakazamModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("alakazam", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("alakazam", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt index 18c931c057..977b0fc593 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt @@ -51,10 +51,10 @@ class ArbokModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val tail4WaveSegment = WaveSegment(modelPart = tail4, length = 11F) val tail5WaveSegment = WaveSegment(modelPart = tail5, length = 11F) - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("arbok", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("arbok", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("arbok", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("arbok", "blink") } // TODO tongue_flick val wave = WaveAnimation( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt index 47e702c4a9..a1eb6f29cd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt @@ -38,7 +38,7 @@ class BeedrillModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiWi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beedrill", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beedrill", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt index 91cc7ccacd..d0dd6a4f85 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt @@ -42,7 +42,7 @@ class BlastoiseModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip override val profileScale = 0.63F override val profileTranslation = Vec3d(0.0, 0.8, 0.0) - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("blastoise", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("blastoise", "cry") } lateinit var sleep: PokemonPose lateinit var standing: PokemonPose @@ -51,7 +51,7 @@ class BlastoiseModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("blastoise", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("blastoise", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt index 888e58766f..77a08dbe3d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt @@ -36,10 +36,10 @@ class BulbasaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bulbasaur", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bulbasaur", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bulbasaur", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bulbasaur", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt index 9745a4a127..3337ea9252 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt @@ -35,7 +35,7 @@ class ButterfreeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("butterfree", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("butterfree", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt index b3c9776e72..58fdb88256 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt @@ -34,10 +34,10 @@ class CaterpieModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("caterpie", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("caterpie", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("caterpie", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("caterpie", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt index 6f7eca3c04..46b4fc9469 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt @@ -33,7 +33,7 @@ class ChanseyModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chansey", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("chansey", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt index 344001a26c..b1846c284e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt @@ -50,16 +50,15 @@ class CharizardModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var fly: PokemonPose override fun registerPoses() { - animations["physical"] = "q.bedrock_stateful('charizard', 'physical', 'prevents_idle')".asExpressionLike() - animations["special"] = "q.bedrock_stateful('charizard', 'special', 'prevents_idle')".asExpressionLike() - animations["status"] = "q.bedrock_stateful('charizard', 'status', 'prevents_idle')".asExpressionLike() - animations["recoil"] = "q.bedrock_stateful('charizard', 'recoil')".asExpressionLike() + animations["physical"] = "q.bedrock_primary('charizard', 'physical', 'look', 'curve=symmetrical_wide')".asExpressionLike() + animations["special"] = "q.bedrock_primary('charizard', 'special', 'curve=symmetrical_wide')".asExpressionLike() + animations["status"] = "q.bedrock_primary('charizard', 'status')".asExpressionLike() + animations["recoil"] = "q.bedrock_primary('charizard', 'recoil')".asExpressionLike() + animations["cry"] = "q.bedrock_primary('charizard', 'cry', 'all')".asExpressionLike() - animations["cry"] = "q.bedrock_stateful('charizard', 'cry', 'pauses_pose')".asExpressionLike() + val faint = "q.bedrock_primary('charizard', 'faint', 'curve=one')".asExpressionLike() - val faint = "q.bedrock_stateful('charizard', 'faint', 'prevents_idle')".asExpressionLike() - - val blink = quirk("blink") { bedrockStateful("charizard", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("charizard", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(blink), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt index e44ba72d71..cc65bd25af 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt @@ -41,7 +41,7 @@ class CharmanderModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmander", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmander", "cry") } override fun registerPoses() { sleep = registerPose( @@ -49,7 +49,7 @@ class CharmanderModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi idleAnimations = arrayOf(bedrock("charmander", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("charmander", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("charmander", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt index ab7812fa37..c2e6242b68 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt @@ -39,10 +39,10 @@ class CharmeleonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmeleon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmeleon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charmeleon", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("charmeleon", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt index b4bb054caf..aac9d433d6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt @@ -33,10 +33,10 @@ class ClefableModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefable", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefable", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("clefable", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("clefable", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt index 064db69b6c..e59e908a34 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt @@ -33,10 +33,10 @@ class ClefairyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefairy", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefairy", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("clefairy", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("clefairy", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt index 231455397d..5ef965be8f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt @@ -32,7 +32,7 @@ class DiglettModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("diglett", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("diglett", "blink")} stand = registerPose( poseName = "stand", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt index 7e42a99c35..a7d47ef5dc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt @@ -33,10 +33,10 @@ class DittoModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ditto", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ditto", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ditto", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ditto", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt index 0d03429615..e2650449a8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt @@ -32,9 +32,9 @@ class DodrioModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("dodrio", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("dodrio", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink3") { bedrockStateful("dodrio", "blink3").setPreventsIdle(false) } + val blink1 = quirk("blink1") { bedrockStateful("dodrio", "blink1") } + val blink2 = quirk("blink2") { bedrockStateful("dodrio", "blink2") } + val blink3 = quirk("blink3") { bedrockStateful("dodrio", "blink3") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("dodrio", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt index 0afb07d189..d11a1b4657 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt @@ -32,10 +32,10 @@ class DoduoModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("doduo", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("doduo", "blink2").setPreventsIdle(false) } - val bite = quirk("bite") { bedrockStateful("doduo", "bite_quirk1").setPreventsIdle(false) } - val bite2 = quirk("bite2") { bedrockStateful("doduo", "bite_quirk2").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("doduo", "blink1") } + val blink2 = quirk("blink2") { bedrockStateful("doduo", "blink2") } + val bite = quirk("bite") { bedrockStateful("doduo", "bite_quirk1") } + val bite2 = quirk("bite2") { bedrockStateful("doduo", "bite_quirk2") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt index ae8ec43e49..9381520a68 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt @@ -32,7 +32,7 @@ class DragonairModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { // TODO dragonair swish override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dragonair", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("dragonair", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + MOVING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt index 0483eb71c0..99400ad3d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt @@ -47,7 +47,7 @@ class DragoniteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiW lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dragonite", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("dragonite", "blink")} standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt index 2d60066190..8e51fe155f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt @@ -30,7 +30,7 @@ class DratiniModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dratini", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("dratini", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + MOVING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt index ece83cd897..89541dab7f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt @@ -38,7 +38,7 @@ class DrowzeeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("drowzee", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("drowzee", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("drowzee", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt index 4a6d8c6a58..ed10d7560b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt @@ -31,9 +31,9 @@ class DugtrioModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dugtrio", "blink").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("dugtrio", "blink2").setPreventsIdle(false)} - val blink3 = quirk("blink3") { bedrockStateful("dugtrio", "blink3").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("dugtrio", "blink")} + val blink2 = quirk("blink2") { bedrockStateful("dugtrio", "blink2")} + val blink3 = quirk("blink3") { bedrockStateful("dugtrio", "blink3")} registerPose( poseName = "stand", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt index 2b13a8c016..f466a2250d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt @@ -49,12 +49,12 @@ class EeveeModel(root: ModelPart) : PokemonPoseableModel(), EaredFrame, HeadedFr lateinit var shoulderLeft: PokemonPose lateinit var shoulderRight: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("eevee", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("eevee", "cry") } val shoulderOffset = 4 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("eevee", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("eevee", "blink") } stand = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt index a6c195c0a6..510ead5bf4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt @@ -53,14 +53,14 @@ class EkansModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ekans", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ekans", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ekans", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("ekans", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ekans", "blink") } registerPose( poseName = "normal", poseTypes = STATIONARY_POSES + MOVING_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt index 92d2287c49..c68738e760 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt @@ -38,7 +38,7 @@ class ElectabuzzModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("electabuzz", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("electabuzz", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt index 743423072f..7cb2d0d5a7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt @@ -29,7 +29,7 @@ class ElectrodeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("electrode", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("electrode", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt index dbc3d7c09b..2ab2eb29d6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt @@ -33,12 +33,12 @@ class ExeggcuteModel(root: ModelPart) : PokemonPoseableModel() { lateinit var uiPortrait: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("exeggcute", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("exeggcute", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("exeggcute", "blink3").setPreventsIdle(false) } - val blink4 = quirk("blink") { bedrockStateful("exeggcute", "blink4").setPreventsIdle(false) } - val blink5 = quirk("blink") { bedrockStateful("exeggcute", "blink5").setPreventsIdle(false) } - val blink6 = quirk("blink") { bedrockStateful("exeggcute", "blink6").setPreventsIdle(false) } + val blink1 = quirk("blink") { bedrockStateful("exeggcute", "blink") } + val blink2 = quirk("blink") { bedrockStateful("exeggcute", "blink2") } + val blink3 = quirk("blink") { bedrockStateful("exeggcute", "blink3") } + val blink4 = quirk("blink") { bedrockStateful("exeggcute", "blink4") } + val blink5 = quirk("blink") { bedrockStateful("exeggcute", "blink5") } + val blink6 = quirk("blink") { bedrockStateful("exeggcute", "blink6") } uiPortrait = registerPose( poseName = "portrait", poseType = PoseType.PORTRAIT, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt index da3f07af8f..03a757e507 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt @@ -48,10 +48,10 @@ class ExeggutorAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink3").setPreventsIdle(false) } - val blink4 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink4").setPreventsIdle(false) } + val blink1 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink") } + val blink2 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink2") } + val blink3 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink3") } + val blink4 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink4") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("exeggutor_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt index bdc0b9d36c..ed32c9caaf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt @@ -50,9 +50,9 @@ class ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("exeggutor", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("exeggutor", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("exeggutor", "blink3").setPreventsIdle(false) } + val blink1 = quirk("blink") { bedrockStateful("exeggutor", "blink") } + val blink2 = quirk("blink") { bedrockStateful("exeggutor", "blink2") } + val blink3 = quirk("blink") { bedrockStateful("exeggutor", "blink3") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("exeggutor", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt index efdf44f7b7..16bdfdfe80 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt @@ -35,10 +35,10 @@ class FarfetchdGalarianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd_galar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd_galar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("farfetchd_galar", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("farfetchd_galar", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt index a7110108f2..3935026bf2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt @@ -37,13 +37,13 @@ class FarfetchdModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("farfetchd", "blink").setPreventsIdle(false) } - val leakflipidle = quirk("leakflipidle", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_idle").setPreventsIdle(false) } - val leakflipwalk = quirk("leakflipwalk", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_walk").setPreventsIdle(false) } - val wink = quirk("wink", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_wink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("farfetchd", "blink") } + val leakflipidle = quirk("leakflipidle", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_idle") } + val leakflipwalk = quirk("leakflipwalk", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_walk") } + val wink = quirk("wink", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_wink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt index 4b47560c1f..5827a46220 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt @@ -44,10 +44,10 @@ class FearowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fearow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fearow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fearow", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("fearow", "blink") } stand = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt index f4d103d844..59de3fa4da 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt @@ -31,7 +31,7 @@ class FlareonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flareon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flareon", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt index f8193be83e..87483f0e20 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt @@ -32,7 +32,7 @@ class GastlyModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("gastly", "blink").setPreventsIdle(false) } + val blink = quirk(name = "blink") { bedrockStateful("gastly", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt index 7ee117e5e3..3496f285c3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt @@ -31,7 +31,7 @@ class GastlyShinyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("gastly_shiny", "blink").setPreventsIdle(false) } + val blink = quirk(name = "blink") { bedrockStateful("gastly_shiny", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt index 20acfdac30..fad1a60d8d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt @@ -31,7 +31,7 @@ class GeodudeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("geodude", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("geodude", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("geodude", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt index a86fe7960b..32d8fc6498 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt @@ -33,10 +33,10 @@ class GolbatModel(root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var battleidle: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golbat", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golbat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golbat", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("golbat", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt index 15ead3a4b4..55a124e7bb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt @@ -33,7 +33,7 @@ class GolduckModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golduck", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("golduck", "blink")} standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt index de817c6453..3a67f940f8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt @@ -36,7 +36,7 @@ class GolemModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golem", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("golem", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt index 6ee2f148f9..0350a2390b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt @@ -34,7 +34,7 @@ class GravelerModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("graveler", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("graveler", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt index 93b5ccb9d0..0d1b1dc3e3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt @@ -31,7 +31,7 @@ class GrimerModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grimer", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("grimer", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt index ebddb1c022..4ddae9f29e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt @@ -39,7 +39,7 @@ class GrowlitheModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("growlithe", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("growlithe", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("growlithe", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt index 12d69ce2ef..e1920117cf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt @@ -61,7 +61,7 @@ class GyaradosModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override val profileTranslation = Vec3d(-0.1, 0.65, 0.0) override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gyarados", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("gyarados", "blink")} registerPose( poseName = "land", poseTypes = STANDING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt index b0e853cea3..c59c39afe4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt @@ -32,7 +32,7 @@ class HaunterModel(root: ModelPart) : PokemonPoseableModel() { val offsetY = -3.0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("haunter", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("haunter", "blink")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt index ab2d34cfba..67146114a0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt @@ -43,7 +43,7 @@ class HitmonchanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hitmonchan", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("hitmonchan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt index cceba24d49..17db552aab 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt @@ -41,7 +41,7 @@ class HitmonleeModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bima lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hitmonlee", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("hitmonlee", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt index aa1f4235ae..103f761841 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt @@ -30,7 +30,7 @@ class HorseaModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("horsea", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("horsea", "blink") } standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt index 2af29a3d66..091f47c6f1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt @@ -38,7 +38,7 @@ class HypnoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFr lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hypno", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("hypno", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("hypno", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt index 97f12c6af6..ac6b2d60ca 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt @@ -39,10 +39,10 @@ class IvysaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ivysaur", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ivysaur", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ivysaur", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ivysaur", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt index 21b454bb45..84f707c48a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt @@ -33,7 +33,7 @@ class JigglypuffModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("jigglypuff", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("jigglypuff", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("jigglypuff", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt index 272a26997b..bb09b4df6d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt @@ -31,7 +31,7 @@ class JolteonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("jolteon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("jolteon", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt index f6b2536551..4049e23b83 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt @@ -31,7 +31,7 @@ class JynxModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("jynx", "blink").setPreventsIdle(false)} +// val blink = quirk("blink") { bedrockStateful("jynx", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt index d423b6fc6b..0f1a09cf3a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt @@ -42,7 +42,7 @@ class KadabraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kadabra", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("kadabra", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt index f44f711299..9ff6429590 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt @@ -31,7 +31,7 @@ class KakunaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var standing: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kakuna", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kakuna", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt index 1dc7381e56..8a6cd12ebc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt @@ -31,8 +31,8 @@ class KangaskhanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kangaskhan", "blink").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("kangaskhan", "blink2").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("kangaskhan", "blink")} + val blink2 = quirk("blink2") { bedrockStateful("kangaskhan", "blink2")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt index 66c5a61cb7..f44b138c46 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt @@ -29,7 +29,7 @@ class KoffingModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("koffing", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("koffing", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt index cc3412b250..364be979d4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt @@ -31,9 +31,9 @@ class KrabbyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("krabby", "blink").setPreventsIdle(false)} - val snipLeft = quirk("blink") { bedrockStateful("krabby", "snip_left").setPreventsIdle(false)} - val snipRight = quirk("blink") { bedrockStateful("krabby", "snip_right").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("krabby", "blink")} + val snipLeft = quirk("blink") { bedrockStateful("krabby", "snip_left")} + val snipRight = quirk("blink") { bedrockStateful("krabby", "snip_right")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt index 99eabadce7..9eb0f0b651 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt @@ -34,7 +34,7 @@ class LaprasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var underwaterMove: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lapras", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lapras", "blink") } landIdle = registerPose( poseName = "land_idle", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt index d68a72da74..741563bdf2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt @@ -39,7 +39,7 @@ class LickitungModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lickitung", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("lickitung", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt index f91b7f75a4..322b785e52 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt @@ -32,7 +32,7 @@ class MachampModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("machamp", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("machamp", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt index 0a184c3070..c82a8aebcc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt @@ -31,7 +31,7 @@ class MachokeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("machoke", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("machoke", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt index cb9a3b9a9a..8efad87eb1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt @@ -31,7 +31,7 @@ class MachopModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("machop", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("machop", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt index 03c3b42386..af1cc68393 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt @@ -33,7 +33,7 @@ class MagikarpModel(root: ModelPart) : PokemonPoseableModel() { override val profileTranslation = Vec3d(0.0, 0.40, 0.0) override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magikarp", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("magikarp", "blink")} registerPose( poseName = "land", poseTypes = STANDING_POSES + PoseType.PROFILE, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt index 441ab8587b..de8a964fc0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt @@ -31,7 +31,7 @@ class MagnemiteModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magnemite", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("magnemite", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("magnemite", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt index 426bda650d..5130e4d24c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt @@ -31,7 +31,7 @@ class MagnetonModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magneton", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("magneton", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("magneton", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt index 6839b57fb9..ec919cf45d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt @@ -33,10 +33,10 @@ class MankeyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mankey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mankey", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mankey", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mankey", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt index fa327778ad..32d0651478 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt @@ -42,7 +42,7 @@ class MeowthAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowth_alolan", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("meowth_alolan", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt index 8c6f109e1d..40decaa6d4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt @@ -42,7 +42,7 @@ class MeowthGalarianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowth_galarian", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("meowth_galarian", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("meowth_galarian", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt index ad8ce38bdf..6110bb9fcd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt @@ -42,7 +42,7 @@ class MeowthModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowth", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("meowth", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt index cf8224065c..dc89216184 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt @@ -29,10 +29,10 @@ class MetapodModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var standing: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metapod", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metapod", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("metapod", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("metapod", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("metapod", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt index fff2d99fdc..54248e017f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt @@ -40,7 +40,7 @@ class MewtwoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bimanu lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mewtwo", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mewtwo", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt index 22d1879ea6..e83660cacc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt @@ -35,7 +35,7 @@ class MrmimeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mr_mime", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("mr_mime", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt index 487f8545a6..27ce39097a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt @@ -31,7 +31,7 @@ class MukModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("muk", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("muk", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt index e3ebd04160..208d43e1bc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt @@ -41,7 +41,7 @@ class NidokingModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidoking", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("nidoking", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt index 8e3598fa1b..225edf311d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt @@ -41,8 +41,8 @@ class NidoqueenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidoqueen", "blink").setPreventsIdle(false)} - val spg = quirk("SPG", secondsBetweenOccurrences = 600F to 900F) { bedrockStateful("nidoqueen", "spgs_happy_place").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("nidoqueen", "blink")} + val spg = quirk("SPG", secondsBetweenOccurrences = 600F to 900F) { bedrockStateful("nidoqueen", "spgs_happy_place") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt index b7464e68eb..5df7d34672 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt @@ -40,7 +40,7 @@ class NidorinaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidorina", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("nidorina", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt index 045779c843..1aa0c46479 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt @@ -37,7 +37,7 @@ class NidorinoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidorino", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("nidorino", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt index 32404315ad..322d4042f6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt @@ -47,7 +47,7 @@ class NinetalesAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ninetales_alolan", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("ninetales_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ninetales_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt index 86feb40436..c470bc7ab4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt @@ -47,7 +47,7 @@ class NinetalesModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ninetales", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("ninetales", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ninetales", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt index 5d18836091..840a7b503c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt @@ -33,7 +33,7 @@ class OddishModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("oddish", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("oddish", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt index edefb5010f..9f011c31ff 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt @@ -37,10 +37,10 @@ class OnixModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("onix", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("onix", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("onix", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("onix", "blink") } ui = registerPose( poseName = "ui", poseTypes = UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt index 60147112d3..c002767d46 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt @@ -36,7 +36,7 @@ class ParasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("paras", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("paras", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES + SHOULDER_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt index 75558f4d5f..71edcfd806 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt @@ -40,7 +40,7 @@ class PersianAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("persian_alolan", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("persian_alolan", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt index 49624eb604..f74afe1b60 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt @@ -40,7 +40,7 @@ class PersianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("persian", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("persian", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt index 06ecf3d31c..56582c1081 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt @@ -44,7 +44,7 @@ class PidgeotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeot", "cry") } override fun registerPoses() { sleep = registerPose( @@ -52,7 +52,7 @@ class PidgeotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped idleAnimations = arrayOf(bedrock("pidgeot", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("pidgeot", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("pidgeot", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt index 940dcd1103..af50e77749 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt @@ -46,14 +46,14 @@ class PidgeottoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeotto", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeotto", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("pidgeotto", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("pidgeotto", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("pidgeotto", "blink")} stand = registerPose( poseName = "stand", poseTypes = STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt index 62b60d0c96..1c831dc0fd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt @@ -46,14 +46,14 @@ class PidgeyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgey", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("pidgey", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("pidgey", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pidgey", "blink") } stand = registerPose( poseName = "standing", poseTypes = SHOULDER_POSES + UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt index e0e4946beb..b1a513f72c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt @@ -40,10 +40,10 @@ class PikachuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 1.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pikachu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pikachu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pikachu", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pikachu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt index b68ae03390..2323806657 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt @@ -29,7 +29,7 @@ class PinsirModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pinsir", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("pinsir", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt index 94199160f8..40cbf73acf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt @@ -31,7 +31,7 @@ class PoliwagModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poliwag", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("poliwag", "blink")} standing = registerPose( poseName = "standing", poseTypes = STANDING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt index a0e28da719..294ac60b99 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt @@ -30,7 +30,7 @@ class PoliwhirlModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poliwhirl", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("poliwhirl", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt index e8abc4a06d..5ec07a1f24 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt @@ -30,7 +30,7 @@ class PoliwrathModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poliwrath", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("poliwrath", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STANDING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt index 43ff2bcc6a..3e5ec082d5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt @@ -38,11 +38,11 @@ class PonytaGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta_galar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta_galar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ponyta_galar", "blink").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta_galar", "quirk").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ponyta_galar", "blink") } + val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta_galar", "quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt index f54360beaf..f3bfa11b2f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt @@ -41,11 +41,11 @@ class PonytaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ponyta", "blink").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta", "quirk1").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ponyta", "blink") } + val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta", "quirk1") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt index 0d1af7f98d..81f790ab05 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt @@ -38,7 +38,7 @@ class PorygonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("porygonz", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("porygonz", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("porygon", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt index b42e333bbf..a6034a22a4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt @@ -33,10 +33,10 @@ class PrimeapeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primeape", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primeape", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("primeape", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("primeape", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt index 45d1dae8c9..56806bde00 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt @@ -35,7 +35,7 @@ class PsyduckModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("psyduck", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("psyduck", "blink")} standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt index 471372c30d..88345a8d27 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt @@ -34,10 +34,10 @@ class RaichuAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu_alolan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu_alolan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raichu_alolan", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("raichu_alolan", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt index dfb8b51e55..101db819d6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt @@ -34,10 +34,10 @@ class RaichuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raichu", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("raichu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt index d94619e3cb..c36755c40b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt @@ -36,10 +36,10 @@ class RapidashGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash_galar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash_galar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rapidash_galar", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("rapidash_galar", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt index bbc6299132..c47529e55c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt @@ -42,10 +42,10 @@ class RapidashModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose lateinit var battling: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rapidash", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("rapidash", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rapidash", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt index 32258aade7..03159dda6f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt @@ -40,10 +40,10 @@ class RaticateAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate_alolan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate_alolan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raticate_alolan", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("raticate_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("raticate_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt index fee57c98bf..772babf331 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt @@ -40,14 +40,14 @@ class RaticateModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Eare lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("raticate", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("raticate", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("raticate", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt index 16db8f5b51..6d2311726b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt @@ -44,10 +44,10 @@ class RattataAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata_alolan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata_alolan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rattata_alolan", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("rattata_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rattata_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt index 5ef8122ce7..c8e02721ac 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt @@ -44,14 +44,14 @@ class RattataModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rattata", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("rattata", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("rattata", "blink")} standing = registerPose( poseName = "standing", poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.STAND, PoseType.FLOAT, PoseType.PORTRAIT, PoseType.SHOULDER_LEFT, PoseType.SHOULDER_RIGHT), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt index 7f6a15b4dc..88ecad9cde 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt @@ -35,7 +35,7 @@ class SandshrewModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sandshrew", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("sandshrew", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt index 72bd832650..759de50714 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt @@ -33,7 +33,7 @@ class SandslashModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sandslash", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("sandslash", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt index f4ee59d94a..c8abf01913 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt @@ -44,7 +44,7 @@ class ScytherModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scyther", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("scyther", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES - PoseType.HOVER, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt index 5eebf8b96d..c4d10e7c2c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt @@ -32,7 +32,7 @@ class SeadraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("seadra", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("seadra", "blink")} standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt index 23bcd124ee..e6f388a8ad 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt @@ -33,9 +33,9 @@ class SlowbroModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slowbro", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("slowbro", "blink2").setPreventsIdle(false) } - val bite = quirk("bite", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("slowbro", "bite_quirk").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("slowbro", "blink1") } + val blink2 = quirk("blink2") { bedrockStateful("slowbro", "blink2") } + val bite = quirk("bite", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("slowbro", "bite_quirk") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt index 79babdec74..10be4aa146 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt @@ -40,7 +40,7 @@ class SlowpokeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slowpoke", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("slowpoke", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt index 7ca4e85d91..6362994827 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt @@ -45,10 +45,10 @@ class SpearowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spearow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spearow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("spearow", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("spearow", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt index db7a3f5ee9..05fcd50527 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt @@ -42,10 +42,10 @@ class SquirtleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var swim: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squirtle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squirtle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("squirtle", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("squirtle", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt index 3d4fd4d337..9174551f01 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt @@ -31,10 +31,10 @@ class TaurosModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tauros", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tauros", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tauros", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("tauros", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt index 6873a2f8fb..640f4eb069 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt @@ -32,7 +32,7 @@ class TentacoolModel(root: ModelPart) : PokemonPoseableModel() { lateinit var watersleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tentacool", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("tentacool", "blink")} standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt index 535c2ab602..f74c49feaf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt @@ -32,7 +32,7 @@ class TentacruelModel(root: ModelPart) : PokemonPoseableModel() { lateinit var watersleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tentacruel", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("tentacruel", "blink")} standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt index 3385dd8b13..7465d1989f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt @@ -33,7 +33,7 @@ class VaporeonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swimIdle: PokemonPose lateinit var swimMove: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vaporeon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vaporeon", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt index b8759330b7..5fa4622aae 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt @@ -40,10 +40,10 @@ class VenusaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venusaur", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venusaur", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("turtwig", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("turtwig", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt index 550eb7db85..b5c8811cc1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt @@ -33,7 +33,7 @@ class VileplumeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vileplume", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("vileplume", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt index fa3db8732f..23c1474be6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt @@ -29,7 +29,7 @@ class VoltorbModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("voltorb", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("voltorb", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt index 6d696cd22c..7e30c5bfa4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt @@ -40,7 +40,7 @@ class VulpixAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vulpix_alolan", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("vulpix_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("vulpix_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt index 6506ae7625..4939f0c291 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt @@ -40,7 +40,7 @@ class VulpixModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vulpix", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("vulpix", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("vulpix", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt index 7637c2d038..e9faaf8641 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt @@ -50,10 +50,10 @@ class WartortleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var swimIdle: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wartortle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wartortle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wartortle", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("wartortle", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt index 40f04dea37..3d0b78bbf6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt @@ -34,10 +34,10 @@ class WeedleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("weedle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("weedle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("weedle", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("weedle", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("weedle", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt index ef8f574f34..ac1bd90e9d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt @@ -29,8 +29,8 @@ class WeezingModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("weezing", "blink").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("weezing", "blink2").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("weezing", "blink")} + val blink2 = quirk("blink2") { bedrockStateful("weezing", "blink2")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt index 79b5f16455..715ee4fec3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt @@ -31,7 +31,7 @@ class WigglytuffModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wigglytuff", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("wigglytuff", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("wigglytuff", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt index f2868955cb..1504ff3fec 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt @@ -39,10 +39,10 @@ class ZubatModel(root: ModelPart) : PokemonPoseableModel() { val shoulderOffset = 0 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("zubat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("zubat", "cry") } override fun registerPoses() { - val twitch = quirk("twitch") { bedrockStateful("zubat", "eartwitch").setPreventsIdle(false) } + val twitch = quirk("twitch") { bedrockStateful("zubat", "eartwitch") } sleep = registerPose( poseType = PoseType.SLEEP, transformedParts = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt index 975a06de2e..8c0dce3adb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt @@ -38,10 +38,10 @@ class AipomModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aipom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aipom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("aipom", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("aipom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("aipom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt index 844aeda41e..8c71612911 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt @@ -33,12 +33,12 @@ class AmpharosModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ampharos", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ampharos", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ampharos", "blink").setPreventsIdle(false) } - val glow = quirk("glow") { bedrockStateful("ampharos", "quirk_glow").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("ampharos", "quirk_toes").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ampharos", "blink") } + val glow = quirk("glow") { bedrockStateful("ampharos", "quirk_glow") } + val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("ampharos", "quirk_toes") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ampharos", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt index 7016171268..6336c1c9c1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt @@ -31,10 +31,10 @@ class BayleefModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bayleef", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bayleef", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bayleef", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bayleef", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("bayleef", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt index 455219382a..0595b6533d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt @@ -32,7 +32,7 @@ class BellossomModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bellossom", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bellossom", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES + SHOULDER_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt index b5a01edc94..7fbafc7400 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt @@ -31,10 +31,10 @@ class ChikoritaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chikorita", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chikorita", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chikorita", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("chikorita", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("chikorita", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt index 50ee820832..f2d68d8778 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt @@ -27,7 +27,7 @@ class ChinchouModel (root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chinchou", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("chinchou", "blink")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt index 5aea466843..445c4c6348 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt @@ -36,10 +36,10 @@ class CleffaModel(root: ModelPart) : PokemonPoseableModel() { lateinit var leftShoulder: PokemonPose lateinit var rightShoulder: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cleffa", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cleffa", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cleffa", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cleffa", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt index c7e8620297..8635f59515 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt @@ -31,10 +31,10 @@ class CrobatModel(root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crobat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crobat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("crobat", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("crobat", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt index 22d9aebd6d..689d865771 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt @@ -46,10 +46,10 @@ class CroconawModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip val wateroffset = -10 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("croconaw", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("croconaw", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("croconaw", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("croconaw", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt index deafd237f8..8cec2d934f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt @@ -31,10 +31,10 @@ class CyndaquilModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("cyndaquil", "battle_cry").setPreventsIdle(false) else bedrockStateful("cyndaquil", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("cyndaquil", "battle_cry") else bedrockStateful("cyndaquil", "cry") } override fun registerPoses() { -// val sneeze = quirk("sneeze") { bedrockStateful("cyndaquil", "sneeze_quirk").setPreventsIdle(false) } +// val sneeze = quirk("sneeze") { bedrockStateful("cyndaquil", "sneeze_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt index fb60ece63f..5e6963415b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt @@ -34,7 +34,7 @@ class DonphanModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("donphan", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("donphan", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt index 1532803b03..ebc21156b9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt @@ -37,7 +37,7 @@ class ElekidModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bimanua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("elekid", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("elekid", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt index 628da3d671..d74611b00a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt @@ -31,10 +31,10 @@ class EspeonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espeon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espeon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("espeon", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("espeon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt index 683e3dae73..39d08d9dd1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt @@ -46,10 +46,10 @@ class FeraligatrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B val wateroffset = -10 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("feraligatr", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("feraligatr", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("feraligatr", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("feraligatr", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt index cec1701f48..0739dbdc51 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt @@ -33,10 +33,10 @@ class FlaaffyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flaaffy", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flaaffy", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("flaaffy", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("flaaffy", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("flaaffy", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt index 13260acf53..7ec7410033 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt @@ -30,7 +30,7 @@ class ForretressModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("forretress", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("forretress", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt index e49ffa54d9..21303fe153 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt @@ -37,7 +37,7 @@ class GligarModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gligar", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("gligar", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt index ede54c6ef3..455f07a19c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt @@ -33,10 +33,10 @@ class GranbullModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("granbull", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("granbull", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("granbull", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("granbull", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("granbull", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt index a4295ba6dd..389cd78449 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt @@ -32,10 +32,10 @@ class HitmontopModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hitmontop", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hitmontop", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hitmontop", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("hitmontop", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("hitmontop", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt index e9f2fa1b2d..c11f2314bd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt @@ -30,11 +30,11 @@ class HoothootModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hoothoot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hoothoot", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hoothoot", "blink").setPreventsIdle(false)} - val quirk = quirk("quirk") { bedrockStateful("hoothoot", "quirk_foot").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("hoothoot", "blink")} + val quirk = quirk("quirk") { bedrockStateful("hoothoot", "quirk_foot")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt index c210777261..c81c3fd04e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt @@ -29,7 +29,7 @@ class IgglybuffModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("igglybuff", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("igglybuff", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt index b4c79c461c..b50d8b0596 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt @@ -34,7 +34,7 @@ class KingdraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kingdra", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("kingdra", "blink") } standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt index 8d550e79b3..e41b860ea1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt @@ -27,7 +27,7 @@ class LanturnModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lanturn", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("lanturn", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt index 65a77ce9a1..671f5ea4a4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt @@ -33,7 +33,7 @@ class MagcargoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magcargo", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("magcargo", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt index bcdf32d7a4..603ecdcdf2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt @@ -33,7 +33,7 @@ class MagcargoShinyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magcargo_shiny", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("magcargo_shiny", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt index 4874893769..5d527de1c8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt @@ -39,10 +39,10 @@ class MareepModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var shearedsleep: PokemonPose lateinit var shearedbattleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mareep", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mareep", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mareep", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mareep", "blink") } sleep = registerPose( poseName = "unsheared_sleep", poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt index 223f6a0806..527fa54b61 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt @@ -31,10 +31,10 @@ class MeganiumModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meganium", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meganium", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meganium", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("meganium", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("meganium", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt index 47ba7c834f..1a8e433fac 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt @@ -37,7 +37,7 @@ class MiltankModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("miltank", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("miltank", "cry") } override fun registerPoses() { sleep = registerPose( @@ -45,7 +45,7 @@ class MiltankModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe idleAnimations = arrayOf(bedrock("miltank", "ground_sleep")) ) - val blink = quirk("blink") { bedrockStateful("miltank", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("miltank", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt index 384e55f1fd..b6cef985e8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt @@ -29,7 +29,7 @@ class MisdreavusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("misdreavus", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("misdreavus", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt index dd7aafc828..bb07cad8ca 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt @@ -34,7 +34,7 @@ class MurkrowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var fly: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("murkrow", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("murkrow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt index 9d0462c8c1..fe3ea65178 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt @@ -31,7 +31,7 @@ class NatuModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("natu", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("natu", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt index a5600c64f5..ca4fab0914 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt @@ -41,10 +41,10 @@ class NoctowlModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("noctowl", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("noctowl", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("noctowl", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("noctowl", "blink")} standing = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt index 43dc688099..9bc7d6050e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt @@ -36,7 +36,7 @@ class PhanpyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("phanpy", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("phanpy", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt index 4d37b55778..83d1438051 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt @@ -38,10 +38,10 @@ class PichuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 0.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pichu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pichu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pichu", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pichu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt index c785b5aefa..59add91ce0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt @@ -30,7 +30,7 @@ class PinecoModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pineco", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("pineco", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt index dc6daea178..4a4bc90308 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt @@ -38,7 +38,7 @@ class Porygon2Model(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("porygon2", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("porygon2", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("porygon2", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt index 67823addfd..b246990aa5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt @@ -40,10 +40,10 @@ class QuagsireModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quagsire", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quagsire", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quagsire", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("quagsire", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt index 6f265e4e4d..dc5bd99357 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2 +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose @@ -31,10 +32,10 @@ class QuilavaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("quilava", "battle_cry").setPreventsIdle(false) else bedrockStateful("quilava", "cry").setPreventsIdle(true) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("quilava", "battle_cry") else PrimaryAnimation(bedrockStateful("quilava", "cry")) } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quilava", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("quilava", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt index 4c3297af7a..da159fed99 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt @@ -48,7 +48,7 @@ class ScizorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scizor", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("scizor", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt index d615d795ef..866d2660a5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt @@ -32,7 +32,7 @@ class ShuckleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ditto", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("ditto", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt index fa79e662fc..a3d5b28a99 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt @@ -33,8 +33,8 @@ class SlowkingModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slowking", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("slowking", "blink2").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("slowking", "blink") } + val blink2 = quirk("blink2") { bedrockStateful("slowking", "blink2") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt index f3135793b7..7546ce3441 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt @@ -33,7 +33,7 @@ class SlugmaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slugma", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("slugma", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt index 03e9d78bcf..bee90528f2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt @@ -33,7 +33,7 @@ class SlugmaShinyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var shiny_walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slugma_shiny", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("slugma_shiny", "blink") } shiny_sleep = registerPose( poseName = "shiny_sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt index 3992da91c1..ecab339a90 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt @@ -31,7 +31,7 @@ class SmoochumModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("smoochum", "blink").setPreventsIdle(false) } +// val blink = quirk("blink") { bedrockStateful("smoochum", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt index f80d6f6989..3fa1615a80 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt @@ -38,7 +38,7 @@ class SneaselModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sneasel", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("sneasel", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt index d0105ef856..ba06694e98 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt @@ -38,7 +38,7 @@ class SnubbullModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snubbull", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snubbull", "cry") } override fun registerPoses() { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt index 257a21a383..34e1a80d18 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt @@ -36,7 +36,7 @@ class StantlerModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("stantler", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("stantler", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt index 7b80daf072..3d72bc28b2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt @@ -34,11 +34,11 @@ class SteelixModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("steelix", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("steelix", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("steelix", "blink").setPreventsIdle(false) } - val jitter = quirk("jitter") { bedrockStateful("steelix", "quirk_jawjitter").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("steelix", "blink") } + val jitter = quirk("jitter") { bedrockStateful("steelix", "quirk_jawjitter") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("steelix", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt index 1da28b17a7..9366d96ceb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt @@ -40,7 +40,7 @@ class SudowoodoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sudowoodo", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("sudowoodo", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt index 1e653803e5..08d52bff45 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt @@ -30,10 +30,10 @@ class TeddiursaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("teddiursa", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("teddiursa", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("teddiursa", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("teddiursa", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt index 9629a9b5be..b56207f0a1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt @@ -49,12 +49,12 @@ class TotodileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip val wateroffset = -10 val shoulderOffset = 5.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("totodile", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("totodile", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("totodile", "blink").setPreventsIdle(false)} - val sleepQuirk = quirk("sleep_quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "sleep_quirk").setPreventsIdle(false)} - val biteyQuirk = quirk("bite_quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "bitey_quirk").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("totodile", "blink")} + val sleepQuirk = quirk("sleep_quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "sleep_quirk")} + val biteyQuirk = quirk("bite_quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "bitey_quirk")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt index 0b6ae30f05..22313187d8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt @@ -31,10 +31,10 @@ class TyphlosionModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("typhlosion", "battle_cry").setPreventsIdle(false) else bedrockStateful("typhlosion", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("typhlosion", "battle_cry") else bedrockStateful("typhlosion", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("typhlosion", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("typhlosion", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt index d3a19b882c..0c9e262ee1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt @@ -39,10 +39,10 @@ class TyrogueModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 3 -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tyrogue", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tyrogue", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tyrogue", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tyrogue", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("tyrogue", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt index eaf98ecbda..40db464d84 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt @@ -31,10 +31,10 @@ class UmbreonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("umbreon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("umbreon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("umbreon", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("umbreon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt index fa303d315f..717f4bb358 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt @@ -38,7 +38,7 @@ class UrsaringModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ursaring", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ursaring", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt index 4e90479893..9d2117b506 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt @@ -41,11 +41,11 @@ class WooperModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var float: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper", "cry") } val shoulderOffset = 2.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wooper", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("wooper", "blink") } sleep = registerPose( poseName = "sleep", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt index 2cd1956654..793365d362 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt @@ -41,11 +41,11 @@ class WooperPaldeanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var float: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper_paldean", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper_paldean", "cry") } val shoulderOffset = 2.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wooper_paldean", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("wooper_paldean", "blink") } sleep = registerPose( poseName = "sleep", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt index a4d2f809ea..5bfb81cd03 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt @@ -27,7 +27,7 @@ class XatuModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("xatu", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("xatu", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt index 8c5ace867b..bafbb009b8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt @@ -31,7 +31,7 @@ class BarboachModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("barboach", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("barboach", "blink") } watersleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt index f7997443a8..c7d59219c0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt @@ -31,11 +31,11 @@ class BeldumModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beldum", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beldum", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("beldum", "blink").setPreventsIdle(false)} - val quirk = quirk("quirk") { bedrockStateful("beldum", "quirk_spin").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("beldum", "blink")} + val quirk = quirk("quirk") { bedrockStateful("beldum", "quirk_spin")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt index e5c9be5959..8743b4e480 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt @@ -36,10 +36,10 @@ class BlazikenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("blaziken", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("blaziken", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("blaziken", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("blaziken", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt index 09d409ba0b..d2689957bd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt @@ -40,10 +40,10 @@ class BreloomModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var sleeping: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("breloom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("breloom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("breloom", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("breloom", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt index 8b89cb609c..8aef20d2a7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt @@ -36,7 +36,7 @@ class CacneaModel (root: ModelPart) : PokemonPoseableModel(), BimanualFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cacnea", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cacnea", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cacnea", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt index d80e55f31b..0e36de847d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt @@ -38,7 +38,7 @@ class CacturneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bim lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cacturne", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cacturne", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cacturne", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt index 2b06c79bf8..3942230cba 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt @@ -36,7 +36,7 @@ class CameruptModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("camerupt", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("camerupt", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt index 982c57b4a6..3c3c01e0af 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt @@ -30,7 +30,7 @@ class ChimechoModel(root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chimecho", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("chimecho", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("chimecho", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt index 1ffe931d94..70b4d493b7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt @@ -33,7 +33,7 @@ class ClaydolModel(root: ModelPart) : PokemonPoseableModel() { idleAnimations = arrayOf(bedrock("claydol", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("claydol", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("claydol", "blink") } standing = registerPose( poseName = "hover", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt index e79c9f5b50..6ecd2041f9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt @@ -36,10 +36,10 @@ class CombuskenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("combusken", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("combusken", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("combusken", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("combusken", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt index 19f518d82c..39a67f94f6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt @@ -33,7 +33,7 @@ class DusclopsModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dusclops", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("dusclops", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt index d901ed4020..c28cbe8876 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt @@ -38,10 +38,10 @@ class GardevoirModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gardevoir", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gardevoir", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gardevoir", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("gardevoir", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt index 94fa2ccaa3..bcad01214b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt @@ -36,7 +36,7 @@ class GrovyleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grovyle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grovyle", "cry") } override fun registerPoses() { sleep = registerPose( @@ -44,7 +44,7 @@ class GrovyleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe idleAnimations = arrayOf(bedrock("grovyle", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("grovyle", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("grovyle", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt index e109218808..fa6845b725 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt @@ -39,7 +39,7 @@ class IllumiseModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("illumise", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("illumise", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt index 99ee78f31b..502f3e5b6f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt @@ -38,10 +38,10 @@ class KirliaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kirlia", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kirlia", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kirlia", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("kirlia", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt index fafcd059bf..fa59ef1e4e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt @@ -36,7 +36,7 @@ class LinooneGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFra lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("linoone_galarian", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("linoone_galarian", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt index ab1229439b..8c46346830 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt @@ -33,7 +33,7 @@ class LinooneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("linoone", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("linoone", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("linoone", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt index 76595c9009..9a80906e0e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt @@ -47,7 +47,7 @@ class LombreModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped val wateroffset = 1 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lombre", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lombre", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt index 07fe0e7435..af78804666 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt @@ -44,7 +44,7 @@ class LotadModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { val wateroffset = -2 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charmander", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("charmander", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt index c3cbb0ea44..9613b4347a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt @@ -41,7 +41,7 @@ class LudicoloModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ludicolo", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ludicolo", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt index 43b24c8187..0d8311017f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt @@ -33,7 +33,7 @@ class LuvdiscModel (root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("luvdisc", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("luvdisc", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("luvdisc", "ground_sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt index c2d2f61c67..cb447dd7d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt @@ -36,10 +36,10 @@ class MarshtompModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("marshtomp", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("marshtomp", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("marshtomp", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("marshtomp", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt index c844aaebe0..f1b8c175fa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt @@ -28,7 +28,7 @@ class MasquerainModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var standing: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("masquerain", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("masquerain", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt index 2bd2cd9348..cd84c3767e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt @@ -36,7 +36,7 @@ class MawileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mawile", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mawile", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("mawile", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt index 1c3dce4500..251c8a642b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt @@ -31,10 +31,10 @@ class MetagrossModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metagross", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metagross", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("metagross", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("metagross", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt index 72dc4097ab..152fd1a388 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt @@ -31,10 +31,10 @@ class MetangModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metang", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metang", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("metang", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("metang", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt index 4e4b7c3fff..796081bbe2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt @@ -38,13 +38,13 @@ class MightyenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mightyena", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mightyena", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mightyena", "blink").setPreventsIdle(false) } - val laugh_out_battle = quirk("laugh_out_battle", secondsBetweenOccurrences = 120F to 240F) { bedrockStateful("mightyena", "quirk").setPreventsIdle(false) } - val laugh_in_battle = quirk("laugh_in_battle", secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "quirk").setPreventsIdle(false) } - val sleep_quirk = quirk("sleep_quirk", secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "sleep_quirk").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mightyena", "blink") } + val laugh_out_battle = quirk("laugh_out_battle", secondsBetweenOccurrences = 120F to 240F) { bedrockStateful("mightyena", "quirk") } + val laugh_in_battle = quirk("laugh_in_battle", secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "quirk") } + val sleep_quirk = quirk("sleep_quirk", secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "sleep_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt index 2741df921d..7eb89d987d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt @@ -36,7 +36,7 @@ class MinunModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("minun", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("minun", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt index ff24d225af..138471b786 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt @@ -39,10 +39,10 @@ class MudkipModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var float: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudkip", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudkip", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mudkip", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mudkip", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt index 2489f63fb1..c136e5ce10 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt @@ -36,11 +36,11 @@ class NincadaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nincada", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nincada", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nincada", "blink").setPreventsIdle(false) } - val flutter = quirk("wing_flutter") { bedrockStateful("nincada", "quirk_wingflutter").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("nincada", "blink") } + val flutter = quirk("wing_flutter") { bedrockStateful("nincada", "quirk_wingflutter") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt index dd9daf04a7..20cc147983 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt @@ -35,11 +35,11 @@ class NinjaskModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ninjask", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ninjask", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ninjask", "blink").setPreventsIdle(false) } - val barrelRoll = quirk("run_quirk") { bedrockStateful("ninjask", "run_quirk").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ninjask", "blink") } + val barrelRoll = quirk("run_quirk") { bedrockStateful("ninjask", "run_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt index 60f5abbee6..b9fc6b46ce 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt @@ -36,7 +36,7 @@ class NumelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("numel", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("numel", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt index 422ca58d30..68d0c2c4c4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt @@ -38,7 +38,7 @@ class NuzleafModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nuzleaf", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("nuzleaf", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt index 5111e8eadc..cb45e8db67 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt @@ -43,7 +43,7 @@ class PelipperModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWi val wateroffset = -6 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pelipper", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pelipper", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, condition = { !it.isTouchingWater }, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt index dd2c0305b9..676742d615 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt @@ -36,7 +36,7 @@ class PlusleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("plusle", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("plusle", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt index c9bdc11c08..075993ce55 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt @@ -38,10 +38,10 @@ class PoochyenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("poochyena", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("poochyena", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poochyena", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("poochyena", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt index dd7407cb63..03c28bbe4d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt @@ -38,10 +38,10 @@ class RaltsModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ralts", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ralts", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ralts", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ralts", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt index dc2965d4da..a242a436dd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt @@ -36,14 +36,14 @@ class SceptileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sceptile", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sceptile", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("sceptile", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("sceptile", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("sceptile", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt index 2532b53e5e..6f9a67fc3d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt @@ -32,7 +32,7 @@ class SeedotModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("seedot", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("seedot", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt index 17b5b0bcd8..b06305fc4e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt @@ -33,10 +33,10 @@ class ShedinjaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shedinja", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shedinja", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shedinja", "blink_WIP").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("shedinja", "blink_WIP") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt index 3e0334d334..0414362087 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt @@ -38,7 +38,7 @@ class ShiftryModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shiftry", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("shiftry", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt index 7e2e241cef..bb80a2254d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt @@ -40,10 +40,10 @@ class ShroomishModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleeping: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroomish", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroomish", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shroomish", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("shroomish", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt index 6601909e22..632e88c536 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt @@ -35,7 +35,7 @@ class SurskitModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val wateroffset = -8 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("surskit", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("surskit", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt index 78980171b7..8f6ae075cd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt @@ -39,10 +39,10 @@ class SwampertModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swampert", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swampert", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("swampert", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("swampert", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt index 842588a98b..e5fd01b60b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt @@ -38,10 +38,10 @@ class SwellowModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swellow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swellow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("swellow", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("swellow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("swellow", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt index 8ea2166f15..63b5eb24ca 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt @@ -38,10 +38,10 @@ class TaillowModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("taillow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("taillow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("taillow", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("taillow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("taillow", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt index 38d12739ad..8d8b1f7ccd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt @@ -36,10 +36,10 @@ class TorchicModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torchic", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torchic", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torchic", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("torchic", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt index 2599f1ed8b..809b92c21c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt @@ -36,7 +36,7 @@ class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("treecko", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("treecko", "cry") } override fun registerPoses() { sleep = registerPose( @@ -44,7 +44,7 @@ class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe idleAnimations = arrayOf(bedrock("treecko", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("treecko", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("treecko", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt index ba618b3fdc..824d3ad4ad 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt @@ -39,7 +39,7 @@ class VolbeatModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("volbeat", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("volbeat", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt index 3e37dced36..21c276f964 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt @@ -34,7 +34,7 @@ class WailordModel(root: ModelPart) : PokemonPoseableModel() { val offsetY = 0.0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wailord", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("wailord", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt index 9050c12298..eb8275b247 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt @@ -43,7 +43,7 @@ class WingullModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWin val wateroffset = -9 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wingull", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("wingull", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, condition = { !it.isTouchingWater }, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt index c6e1ecf1f4..afb6ca63a8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt @@ -36,7 +36,7 @@ class ZigzagoonGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("zigzagoon_galarian", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("zigzagoon_galarian", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt index 542b39b3b2..1b61b412a1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt @@ -40,7 +40,7 @@ class ZigzagoonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffsetZ = -0.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("zigzagoon", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("zigzagoon", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("zigzagoon", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt index 50f534f8a0..c0bb1882c6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt @@ -38,10 +38,10 @@ class AmbipomModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ambipom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ambipom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ambipom", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ambipom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ambipom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt index 8d641995a2..a21ebd2db0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt @@ -44,7 +44,7 @@ class BibarelModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr val wateroffset = -1 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bibarel", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bibarel", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt index 1bba8e403b..ab3268eaa8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt @@ -48,7 +48,7 @@ class BidoofModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru val wateroffset = -2 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bidoof", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bidoof", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt index 712e5aa2d0..2ffd990235 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt @@ -39,7 +39,7 @@ class BonslyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var battlesleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bonsly", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bonsly", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt index 8b44f37389..1d8cbd6521 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt @@ -38,7 +38,7 @@ class BuizelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped // lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("buizel", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("buizel", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("buizel", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt index ed99d7b67d..a23fabd308 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt @@ -36,10 +36,10 @@ class BunearyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("buneary", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("buneary", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("buneary", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("buneary", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt index 475aa39674..39ede36682 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt @@ -29,7 +29,7 @@ class CarnivineModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame{ lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("carnivine", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("carnivine", "blink") } standing = registerPose( poseName = "standing", poseTypes = ALL_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt index 035cf0f1df..b1be12b5f8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt @@ -46,7 +46,7 @@ class ChatotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chatot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chatot", "cry") } override fun registerPoses() { @@ -56,7 +56,7 @@ class ChatotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF // idleAnimations = arrayOf(bedrock("chatot", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("chatot", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("chatot", "blink") } stand = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt index 7d7cd3dc77..94eeebccee 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt @@ -39,10 +39,10 @@ class ChimcharModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chimchar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chimchar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chimchar", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("chimchar", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt index 41ddcc0692..d9149831e3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt @@ -36,11 +36,11 @@ class ChinglingModel(root: ModelPart) : PokemonPoseableModel() { lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chingling", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chingling", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chingling", "blink").setPreventsIdle(false) } - val sleepquirk = quirk("sleepquirk") { bedrockStateful("chingling", "sleep_quirk").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("chingling", "blink") } + val sleepquirk = quirk("sleepquirk") { bedrockStateful("chingling", "sleep_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(sleepquirk), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt index 39de9bb465..6d239ed3f0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt @@ -30,9 +30,9 @@ class CombeeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("combee", "blink_right").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("combee", "blink_gender").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("combee", "blink_left").setPreventsIdle(false) } + val blink1 = quirk("blink") { bedrockStateful("combee", "blink_right") } + val blink2 = quirk("blink") { bedrockStateful("combee", "blink_gender") } + val blink3 = quirk("blink") { bedrockStateful("combee", "blink_left") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt index 591c6f10ba..5dc5f46197 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt @@ -29,7 +29,7 @@ class DrifblimModel (root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("drifblim", "blink").setPreventsIdle(false) } + val blink = quirk(name = "blink") { bedrockStateful("drifblim", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt index c4ea36fb54..38e9c29dfa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt @@ -29,7 +29,7 @@ class DrifloonModel (root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("drifloon", "blink").setPreventsIdle(false) } + val blink = quirk(name = "blink") { bedrockStateful("drifloon", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt index 28f52ab643..98ffc1e39a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt @@ -33,7 +33,7 @@ class DusknoirModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dusknoir", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("dusknoir", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt index 5b2fea6c6e..e1616f97d6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt @@ -38,7 +38,7 @@ class ElectivireModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("electivire", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("electivire", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt index 9c1e1b843c..b5596b19bc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt @@ -38,10 +38,10 @@ class EmpoleonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var swim: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("empoleon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("empoleon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("empoleon", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("empoleon", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("empoleon", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt index 8cf1ee718d..09989d96ad 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt @@ -38,7 +38,7 @@ class FloatzelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip // lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("floatzel", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("floatzel", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("floatzel", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt index 1617bf7218..434dc1328d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt @@ -37,7 +37,7 @@ class GabiteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gabite", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("gabite", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt index d4fd723bd2..ebf3440982 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt @@ -9,6 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose @@ -33,11 +34,11 @@ class GalladeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gallade", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gallade", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gallade", "blink").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 10F to 60F) { bedrockStateful("gallade", "battle_quirk").setPreventsIdle(true) } + val blink = quirk("blink") { bedrockStateful("gallade", "blink") } + val quirk = quirk("quirk", secondsBetweenOccurrences = 10F to 60F) { PrimaryAnimation(bedrockStateful("gallade", "battle_quirk")) } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("gallade", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt index 081f68a53d..c2af575ee9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt @@ -39,7 +39,7 @@ class GarchompModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("garchomp", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("garchomp", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt index d248a27f7a..172810f470 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt @@ -34,7 +34,7 @@ class GibleModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bimanual lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gible", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("gible", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt index acc0ce8374..2e069942f7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt @@ -31,10 +31,10 @@ class GlaceonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glaceon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glaceon", "cry") } override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("glaceon", "blink").setPreventsIdle(false)} +// val blink = quirk("blink") { bedrockStateful("glaceon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt index 9fc3b7443b..36f06fe536 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt @@ -36,7 +36,7 @@ class GliscorModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gliscor", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("gliscor", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt index c394d0bbd6..acffdff7bb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt @@ -38,11 +38,11 @@ class GrotleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grotle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grotle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grotle", "blink").setPreventsIdle(false) } - val shake = quirk("shake", secondsBetweenOccurrences = 30F to 360F) { bedrockStateful("grotle", "quirk").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("grotle", "blink") } + val shake = quirk("shake", secondsBetweenOccurrences = 30F to 360F) { bedrockStateful("grotle", "quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt index cbf1f6f290..b3fad090b8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt @@ -43,7 +43,7 @@ class HonchkrowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("honchkrow", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("honchkrow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt index b53b7e00d3..cd1e1208b0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt @@ -41,10 +41,10 @@ class InfernapeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("infernape", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("infernape", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("infernape", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("infernape", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt index 0492499dd3..e38dd5b43e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt @@ -44,7 +44,7 @@ class KricketotModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, Hea val shoulderOffsetZ = 0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kricketot", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("kricketot", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("kricketot", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt index 7aa21a8e4c..e9c04707b1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt @@ -42,7 +42,7 @@ class KricketuneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kricketune", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("kricketune", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("kricketune", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt index a4766a78c7..bbf89a6d27 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt @@ -31,10 +31,10 @@ class LeafeonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("leafeon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("leafeon", "cry") } override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("leafeon", "blink").setPreventsIdle(false)} +// val blink = quirk("blink") { bedrockStateful("leafeon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt index 0494b93606..a79cfda5c1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt @@ -40,7 +40,7 @@ class LickilickyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var battleidle: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lickilicky", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lickilicky", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("lickilicky", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt index c8fb7d97ec..5af8d2e1d3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt @@ -36,9 +36,9 @@ class LopunnyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lopunny", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lopunny", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lopunny", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lopunny", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt index 099a6ece1c..edcd3efb3b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt @@ -38,10 +38,10 @@ class LucarioModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lucario", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lucario", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lucario", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lucario", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt index 3f1e6f2a6b..6caa9a4ada 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt @@ -37,7 +37,7 @@ class LuxioModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var sleep: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("luxio", "blink").setPreventsIdle(false) } +// val blink = quirk("blink") { bedrockStateful("luxio", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("luxio", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt index 7ae98d29e9..87454e36fa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt @@ -36,7 +36,7 @@ class LuxrayModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("luxray", "blink").setPreventsIdle(false) } +// val blink = quirk("blink") { bedrockStateful("luxray", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt index 90b90f47d2..ed30c74e3c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt @@ -29,7 +29,7 @@ class MagnezoneModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magnezone", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("magnezone", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("magnezone", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt index 50103181b3..efe9d387db 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt @@ -42,7 +42,7 @@ class MamoswineModel(root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { idleAnimations = arrayOf(bedrock("mamoswine", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("mamoswine", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mamoswine", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt index c0de414362..a866888554 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt @@ -31,7 +31,7 @@ class MimejrModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mimejr", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mimejr", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt index 3e3ce5cdee..2370f35173 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt @@ -29,7 +29,7 @@ class MismagiusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mismagius", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mismagius", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt index b92116ba16..72c3ba6fc0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt @@ -39,10 +39,10 @@ class MonfernoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("monferno", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("monferno", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("monferno", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("monferno", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt index f3cf6c9c79..32c880eff4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt @@ -31,7 +31,7 @@ class MunchlaxModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("munchlax", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("munchlax", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt index 188100f80e..41e0a47e48 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt @@ -36,7 +36,7 @@ class PachirisuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pachirisu", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pachirisu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt index 991e8a58e9..6859da8840 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt @@ -38,10 +38,10 @@ class PiplupModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var swim: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("piplup", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("piplup", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("piplup", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("piplup", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("piplup", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt index 41f6b2f813..7d9d76a990 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt @@ -35,13 +35,13 @@ class PorygonzModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("porygonz", "blink").setPreventsIdle(false) } - val twitch1 = quirk("twitch1") { bedrockStateful("porygonz", "twitch1").setPreventsIdle(false) } - val twitch2 = quirk("twitch2") { bedrockStateful("porygonz", "twitch2").setPreventsIdle(false) } - val twitch3 = quirk("twitch3") { bedrockStateful("porygonz", "twitch3").setPreventsIdle(false) } - val twitch4 = quirk("twitch4") { bedrockStateful("porygonz", "twitch4").setPreventsIdle(false) } - val twitch5 = quirk("twitch5") { bedrockStateful("porygonz", "twitch5").setPreventsIdle(false) } - val twitch6 = quirk("twitch6") { bedrockStateful("porygonz", "twitch6").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("porygonz", "blink") } + val twitch1 = quirk("twitch1") { bedrockStateful("porygonz", "twitch1") } + val twitch2 = quirk("twitch2") { bedrockStateful("porygonz", "twitch2") } + val twitch3 = quirk("twitch3") { bedrockStateful("porygonz", "twitch3") } + val twitch4 = quirk("twitch4") { bedrockStateful("porygonz", "twitch4") } + val twitch5 = quirk("twitch5") { bedrockStateful("porygonz", "twitch5") } + val twitch6 = quirk("twitch6") { bedrockStateful("porygonz", "twitch6") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(twitch1, twitch2, twitch3, twitch4, twitch5, twitch6), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt index fca46c9859..716d1bb7da 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt @@ -38,10 +38,10 @@ class PrinplupModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var swim: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("prinplup", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("prinplup", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("prinplup", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("prinplup", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("prinplup", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt index 2c698712a1..07e45ee975 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt @@ -33,7 +33,7 @@ class ProbopassModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("probopass", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("probopass", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt index 343a8098a1..40a9c6b3fa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt @@ -38,10 +38,10 @@ class RioluModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("riolu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("riolu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("riolu", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("riolu", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt index 866d6a28b6..b3b529c265 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt @@ -36,7 +36,7 @@ class ShinxModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("shinx", "blink").setPreventsIdle(false) } +// val blink = quirk("blink") { bedrockStateful("shinx", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt index 923b2408fa..3afaab8842 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt @@ -47,7 +47,7 @@ class StaraptorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi // idleAnimations = arrayOf(bedrock("staraptor", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("staraptor", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("staraptor", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt index c6a452b5d3..ed3028580f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt @@ -42,14 +42,14 @@ class StaraviaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("staravia", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("staravia", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("staravia", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("staravia", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("staravia", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt index 0491910a70..00ad2ad2fa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt @@ -48,7 +48,7 @@ class StarlyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("starly", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("starly", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("starly", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt index b1d7470988..f9ae583746 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt @@ -29,7 +29,7 @@ class TangrowthModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tangrowth", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tangrowth", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt index bf4cbd725c..d4334576dc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt @@ -37,10 +37,10 @@ class TorterraCherryModel (root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra_cherry", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra_cherry", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torterra_cherry", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("torterra_cherry", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("torterra_cherry", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt index 9bbe272d61..d348750832 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt @@ -37,10 +37,10 @@ class TorterraModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torterra", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("torterra", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("torterra", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt index 3cedec7279..403c6d2734 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt @@ -43,10 +43,10 @@ class TurtwigModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad val shoulderOffset = 3 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("turtwig", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("turtwig", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("turtwig", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("turtwig", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("turtwig", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt index 5eba991452..5428c57bb2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt @@ -31,8 +31,8 @@ class VespiquenModel (root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("vespiquen", "blink").setPreventsIdle(false) } - val wingsleep = quirk("wingsleep") { bedrockStateful("vespiquen", "sleep_flap").setPreventsIdle(false) } + val blink1 = quirk("blink") { bedrockStateful("vespiquen", "blink") } + val wingsleep = quirk("wingsleep") { bedrockStateful("vespiquen", "sleep_flap") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt index 4a961cad1c..b45e421058 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt @@ -38,7 +38,7 @@ class WeavileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("weavile", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("weavile", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt index 8ed754b051..02480af048 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt @@ -34,7 +34,7 @@ class BoldoreModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boldore", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boldore", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt index a4ddbff78d..37dcbea0dd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt @@ -30,7 +30,7 @@ class BouffalantModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charmander", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("charmander", "blink")} // bouffalant does not have a blink!! someone fix pls standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt index 726c91ca3e..0a55ec8b29 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt @@ -29,7 +29,7 @@ class ChandelureModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("chandelure", "blink").setPreventsIdle(false) } +// val blink = quirk("blink") { bedrockStateful("chandelure", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt index a7a49d6424..9e4d9e19e9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt @@ -31,10 +31,10 @@ class CofagrigusModel (root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cofagrigus", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cofagrigus", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cofagrigus", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cofagrigus", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt index 0f5f9890c5..d91128ae02 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt @@ -34,7 +34,7 @@ class ConkeldurrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("conkeldurr", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("conkeldurr", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt index 0c10c9b339..9c89363195 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt @@ -30,10 +30,10 @@ class CottoneeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame{ lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cottonee", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cottonee", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cottonee", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cottonee", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt index f38276ce45..58dd0c3bd3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt @@ -31,7 +31,7 @@ class CrustleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crustle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crustle", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt index 91529b0970..b354ea5fd1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt @@ -32,7 +32,7 @@ class CryogonalModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cryogonal", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cryogonal", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt index bc3d268406..79c7273f8e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt @@ -41,10 +41,10 @@ class DewottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dewott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dewott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dewott", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("dewott", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt index d3a720f50d..9eaa0eef34 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt @@ -29,7 +29,7 @@ class DurantModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("durant", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("durant", "blink") } standing = registerPose( poseName = "standing", quirks = arrayOf(blink), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt index 1dc1306421..ccce1f5469 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt @@ -31,7 +31,7 @@ class DwebbleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dwebble", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dwebble", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt index 429ba15d73..df538a9d9e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt @@ -37,10 +37,10 @@ class EmboarModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("emboar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("emboar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("emboar", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("emboar", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt index 3ff07914e4..a56e8c1582 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt @@ -43,7 +43,7 @@ class EmolgaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var flying: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("emolga", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("emolga", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES - PoseType.HOVER, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt index 97c0b25c2f..53f337586b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt @@ -27,8 +27,8 @@ class GalvantulaModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("galvantula", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("galvantula", "blink2").setPreventsIdle(false) } + val blink1 = quirk("blink1") { bedrockStateful("galvantula", "blink1") } + val blink2 = quirk("blink2") { bedrockStateful("galvantula", "blink2") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt index b58482d9a2..eb8e1493b5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt @@ -39,7 +39,7 @@ class GigalithModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gigalith", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gigalith", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt index 3c2d9a5304..a8e0aaa5fe 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt @@ -41,7 +41,7 @@ class GolettModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golett", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("golett", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt index 8fb94cfadc..dd44f6b4a6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt @@ -34,7 +34,7 @@ class GolurkModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golurk", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("golurk", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt index 0e9d042838..35d29b490a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt @@ -34,7 +34,7 @@ class GurdurrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gurdurr", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("gurdurr", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt index 87a3c532cd..a7b0af6508 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt @@ -37,7 +37,7 @@ class HeatmorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("heatmor", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("heatmor", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("heatmor", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt index 72f7a9178f..8aa165bd8e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt @@ -36,10 +36,10 @@ class HerdierModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("herdier", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("herdier", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("herdier", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("herdier", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt index 3a461069f6..04b50ea6d9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt @@ -27,8 +27,8 @@ class JoltikModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("joltik", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("joltik", "blink2").setPreventsIdle(false) } + val blink1 = quirk("blink1") { bedrockStateful("joltik", "blink1") } + val blink2 = quirk("blink2") { bedrockStateful("joltik", "blink2") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt index 5778229c09..c357aea82d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt @@ -29,7 +29,7 @@ class LampentModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lampent", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lampent", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt index de8f88e399..1b227ca152 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt @@ -36,10 +36,10 @@ class LillipupModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lillipup", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lillipup", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lillipup", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lillipup", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt index cc2ce48265..0e4456f79e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt @@ -29,7 +29,7 @@ class LitwickModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("litwick", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("litwick", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt index 06b8485c7c..a2cf3ace36 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt @@ -36,10 +36,10 @@ class MaractusModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bima lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maractus", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maractus", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("maractus", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("maractus", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt index 134b33378b..ab513891a7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt @@ -39,10 +39,10 @@ class OshawottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("oshawott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("oshawott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("oshawott", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("oshawott", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt index 249b681f01..fcd92d1591 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt @@ -30,10 +30,10 @@ class PatratModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("patrat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("patrat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("patrat", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("patrat", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt index 05022142fb..e943dbcc7a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt @@ -44,14 +44,14 @@ class PidoveModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidove", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidove", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("pidove", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("pidove", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pidove", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt index 70b0abaad8..2bfca242c0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt @@ -37,10 +37,10 @@ class PigniteModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pignite", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pignite", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pignite", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pignite", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt index 3d3b5a015f..d221be8b8e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt @@ -34,10 +34,10 @@ class RoggenrolaModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("roggenrola", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("roggenrola", "cry") } override fun registerPoses() { - val twitch = quirk("twitch", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("roggenrola", "quirk_twitch").setPreventsIdle(false) } + val twitch = quirk("twitch", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("roggenrola", "quirk_twitch") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("roggenrola", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt index 4deae21806..00a48a3ab9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt @@ -38,10 +38,10 @@ class SamurottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("samurott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("samurott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("samurott", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("samurott", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt index 96953d3d3f..c1249cc578 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt @@ -29,10 +29,10 @@ class ScolipedeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scolipede", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scolipede", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scolipede", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("scolipede", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt index 0c322124f9..0c26e129ed 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt @@ -30,10 +30,10 @@ class SerperiorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("serperior", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("serperior", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("serperior", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("serperior", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("serperior", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt index 2fa00b58d5..ee28a54725 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt @@ -35,10 +35,10 @@ class ServineModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("servine", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("servine", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("servine", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("servine", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt index f8265002fe..1ccf9b34c5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt @@ -35,10 +35,10 @@ class SnivyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snivy", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snivy", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("snivy", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("snivy", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt index 94405818a8..371b518095 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt @@ -36,10 +36,10 @@ class StoutlandModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qu lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stoutland", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stoutland", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("stoutland", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("stoutland", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt index 1448884cb8..38583c3045 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt @@ -36,10 +36,10 @@ class TepigModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tepig", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tepig", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tepig", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tepig", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt index 3e1c2be0e7..cdd8f7899e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt @@ -34,7 +34,7 @@ class TimburrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("timburr", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("timburr", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt index 8831bf209f..abd6389613 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt @@ -44,14 +44,14 @@ class TranquillModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tranquill", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tranquill", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("tranquill", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("tranquill", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tranquill", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt index 3cf41004d2..ac9b618d72 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt @@ -48,7 +48,7 @@ class UnfezantModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("unfezant", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("unfezant", "cry") } override fun registerPoses() { // sleep = registerPose( @@ -56,7 +56,7 @@ class UnfezantModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip // idleAnimations = arrayOf(bedrock("unfezant", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("unfezant", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("unfezant", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt index 24ca3d9eaa..0d2c2f1c1c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt @@ -28,11 +28,11 @@ class VenipedeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venipede", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venipede", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("venipede", "blink").setPreventsIdle(false) } - val twitch = quirk("twitch") { bedrockStateful("venipede", "twitch").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("venipede", "blink") } + val twitch = quirk("twitch") { bedrockStateful("venipede", "twitch") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt index d70bb5214f..5c7547ffd3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt @@ -30,10 +30,10 @@ class WatchogModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("watchog", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("watchog", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("watchog", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("watchog", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt index eaf4939372..dad220641a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt @@ -38,10 +38,10 @@ class WhimsicottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whimsicott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whimsicott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("whimsicott", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("whimsicott", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt index 96909c8c45..7697bea42f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt @@ -29,10 +29,10 @@ class WhirlipedeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whirlipede", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whirlipede", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("whirlipede", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("whirlipede", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt index 30e39fbae6..6316f5362f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt @@ -34,7 +34,7 @@ class YamaskModel (root: ModelPart) : PokemonPoseableModel(), BimanualFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamask", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamask", "cry") } override fun registerPoses() { sleep = registerPose( @@ -42,7 +42,7 @@ class YamaskModel (root: ModelPart) : PokemonPoseableModel(), BimanualFrame { idleAnimations = arrayOf(bedrock("yamask", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("yamask", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("yamask", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt index 34eb9636cf..d7c6db7e33 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt @@ -27,10 +27,10 @@ class AegislashModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aegislash", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aegislash", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("aegislash", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("aegislash", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt index 0294915343..c3e5768184 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt @@ -45,10 +45,10 @@ class AvaluggModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame, H val wateroffset = -3.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("avalugg", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("avalugg", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("avalugg", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("avalugg", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("avalugg", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt index 9f188e07b3..2ef993fd4b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt @@ -37,10 +37,10 @@ class BergmiteModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bergmite", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bergmite", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bergmite", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bergmite", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("bergmite", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt index 555bcafcd6..82f7448f7a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt @@ -41,10 +41,10 @@ class BraixenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("braixen", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("braixen", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("braixen", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("braixen", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt index 2172b47143..6d88109e26 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt @@ -31,12 +31,12 @@ class BunnelbyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bunnelby", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bunnelby", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bunnelby", "blink").setPreventsIdle(false) } - val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("bunnelby", "quirk_sleep").setPreventsIdle(false) } - val sleep2 = quirk("sleep2", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("bunnelby", "quirk_sleep2").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bunnelby", "blink") } + val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("bunnelby", "quirk_sleep") } + val sleep2 = quirk("sleep2", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("bunnelby", "quirk_sleep2") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt index 5a8c2fb3e3..8db1eaf9a1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt @@ -40,10 +40,10 @@ class ChesnaughtModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chesnaught", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chesnaught", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chesnaught", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("chesnaught", "blink")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt index 62a42560df..b71b35ca1e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt @@ -36,10 +36,10 @@ class ChespinModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chespin", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chespin", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chespin", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("chespin", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt index 9647887e5b..6debeb786d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt @@ -42,10 +42,10 @@ class DelphoxModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var battleidle: PokemonPose lateinit var battlewalk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("delphox", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("delphox", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("delphox", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("delphox", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt index bb5152c310..f42f1fadd8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt @@ -32,10 +32,10 @@ class DiggersbyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose lateinit var portrait: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("diggersby", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("diggersby", "cry") } override fun registerPoses() { - val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("diggersby", "quirk_sleep").setPreventsIdle(false) } + val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("diggersby", "quirk_sleep") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt index 2307510a81..cd9211ab03 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt @@ -27,10 +27,10 @@ class DoubladeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("doublade", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("doublade", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("doublade", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("doublade", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt index 4b6e27eaba..6bbd6fa7f0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt @@ -29,10 +29,10 @@ class DragalgeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dragalge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dragalge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dragalge", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("dragalge", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt index f4546cb73b..b8939859ed 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt @@ -33,10 +33,10 @@ class FennekinModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fennekin", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fennekin", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fennekin", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("fennekin", "blink") } standing = registerPose( poseName = "standing", poseTypes = setOf(PoseType.NONE, PoseType.STAND, PoseType.PORTRAIT, PoseType.PROFILE), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt index 3ab2304617..451ace31f6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt @@ -44,14 +44,14 @@ class FletchinderModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchinder", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchinder", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("fletchinder", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("fletchinder", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("fletchinder", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt index f304082c96..c6d8fa4ca8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt @@ -44,14 +44,14 @@ class FletchlingModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchling", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchling", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("fletchling", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("fletchling", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("fletchling", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt index aae7702453..c38ad48937 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt @@ -41,10 +41,10 @@ class FroakieModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("froakie", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("froakie", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("froakie", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("froakie", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt index f4bc7f8cc8..87013fcde2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt @@ -41,10 +41,10 @@ class FrogadierModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("frogadier", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("frogadier", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("frogadier", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("frogadier", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt index ba68234c27..7674e81f63 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt @@ -32,10 +32,10 @@ class GourgeistModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gourgeist", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gourgeist", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gourgeist", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("gourgeist", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt index 6523ce3213..9d6a69c782 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt @@ -44,10 +44,10 @@ class GreninjaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("greninja", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("greninja", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("greninja", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("greninja", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt index 6c08f3f62e..31727953df 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt @@ -27,10 +27,10 @@ class HonedgeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("honedge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("honedge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("honedge", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("honedge", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt index 36d5b700cd..5239d2b334 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt @@ -33,10 +33,10 @@ class PhantumpModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("phantump", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("phantump", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("phantump", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("phantump", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("phantump", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt index 8ea04def83..4bb1f1a29e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt @@ -30,10 +30,10 @@ class PumpkabooModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pumpkaboo", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pumpkaboo", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pumpkaboo", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("pumpkaboo", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt index 0f6f405ac7..fc71c7b193 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt @@ -39,10 +39,10 @@ class QuilladinModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quilladin", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quilladin", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quilladin", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("quilladin", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt index c5b20de014..e10ff40770 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt @@ -32,11 +32,11 @@ class ScatterbugModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scatterbug", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scatterbug", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scatterbug", "blink").setPreventsIdle(false) } - val lookquirk = quirk("lookquirk") { bedrockStateful("scatterbug", "quirk").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("scatterbug", "blink") } + val lookquirk = quirk("lookquirk") { bedrockStateful("scatterbug", "quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt index f06d71c6aa..fb87727802 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt @@ -29,10 +29,10 @@ class SkrelpModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skrelp", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skrelp", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("skrelp", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("skrelp", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt index cd8fa98c5d..0bc90de774 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt @@ -32,11 +32,11 @@ class SpewpaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spewpa", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spewpa", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("spewpa", "blink").setPreventsIdle(false) } - val fluff = quirk("fluff", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("spewpa", "quirk_fluff").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("spewpa", "blink") } + val fluff = quirk("fluff", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("spewpa", "quirk_fluff") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt index 6a19a25999..087328bf6a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt @@ -31,10 +31,10 @@ class SylveonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sylveon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sylveon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sylveon", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("sylveon", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt index 76c2c486ee..c2c9846588 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt @@ -42,7 +42,7 @@ class TalonflameModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("talonflame", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("talonflame", "cry") } override fun registerPoses() { // sleep = registerPose( @@ -50,7 +50,7 @@ class TalonflameModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B // idleAnimations = arrayOf(bedrock("talonflame", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("talonflame", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("talonflame", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt index df877c428e..ecaf404b65 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt @@ -31,10 +31,10 @@ class TrevenantModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("trevenant", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("trevenant", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("trevenant", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("trevenant", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("trevenant", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt index 1159163ea2..06f3260f7c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt @@ -35,10 +35,10 @@ class VivillonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiWi lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vivillon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vivillon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vivillon", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("vivillon", "blink")} sleep = registerPose( poseName = "sleep", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt index 197c55be35..353bab80fb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt @@ -43,10 +43,10 @@ class BewearModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bewear", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bewear", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bewear", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("bewear", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt index 4fe47cb64e..654f408a27 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt @@ -36,10 +36,10 @@ class BrionneModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose // lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("brionne", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("brionne", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("brionne", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("brionne", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("brionne", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt index 84273f5b96..fcf267f209 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt @@ -38,7 +38,7 @@ class ComfeyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biman val shoulderOffset = 1.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("comfey", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("comfey", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("comfey", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt index 83e678c9a5..4b296b0a8b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt @@ -45,7 +45,7 @@ class DartrixModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWing lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dartrix", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dartrix", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt index 04c12bfefb..60e7029dbe 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt @@ -50,10 +50,10 @@ class DecidueyeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("decidueye", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("decidueye", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("decidueye", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("decidueye", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES - PoseType.HOVER + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt index 8814ed5386..99c2a140ff 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt @@ -36,10 +36,10 @@ class GolisopodModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golisopod", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golisopod", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golisopod", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("golisopod", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt index 883c57bd6c..cc9cbbdaba 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt @@ -40,10 +40,10 @@ class IncineroarModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("incineroar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("incineroar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("incineroar", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("incineroar", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt index 57dcf6adad..e4cfb1a4c1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt @@ -24,10 +24,10 @@ class KomalaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("komala", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("komala", "cry") } override fun registerPoses() { - val doze = quirk("doze", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("komala", "quirk_doze_off").setPreventsIdle(false)} + val doze = quirk("doze", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("komala", "quirk_doze_off")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt index 9d127f5480..029a2d6617 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt @@ -38,10 +38,10 @@ class LittenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("litten", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("litten", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("litten", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("litten", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt index 46bf5e813d..fdbdb79e64 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt @@ -36,7 +36,7 @@ class MimikyuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mimikyu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mimikyu", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt index 6dfcfbab37..4f17dc591b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt @@ -26,7 +26,7 @@ class MorelullModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("morelull", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("morelull", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt index 8badc97c79..6aa1f75aee 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt @@ -36,10 +36,10 @@ class MudbrayModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudbray", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudbray", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mudbray", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mudbray", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt index 0454f35968..c0af46167f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt @@ -36,10 +36,10 @@ class MudsdaleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudsdale", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudsdale", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mudsdale", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mudsdale", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt index 9160a17044..d5b6da41d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt @@ -41,7 +41,7 @@ class PoipoleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biman lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poipole", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("poipole", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt index a655995eed..fedf9d169f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt @@ -42,10 +42,10 @@ class PopplioModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 1 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("popplio", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("popplio", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("popplio", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("popplio", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("popplio", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt index 0e2290ff49..ad745787c1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt @@ -36,10 +36,10 @@ class PrimarinaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primarina", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primarina", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("primarina", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("primarina", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt index 5b46c3f563..803245a6a2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt @@ -45,10 +45,10 @@ class RowletModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWinge lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rowlet", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rowlet", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rowlet", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("rowlet", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES - PoseType.HOVER + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt index d3805abdaa..768ea522fd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt @@ -38,7 +38,7 @@ class ShiinoticModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shiinotic", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("shiinotic", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt index 6418a3bb0a..a3f8df6819 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt @@ -40,7 +40,7 @@ class SteeneeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biman lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("steenee", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("steenee", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt index b9c330075d..58208c6f90 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt @@ -39,10 +39,10 @@ class StuffulModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stufful", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stufful", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("stufful", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("stufful", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt index 0afb448ea1..35016daabb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt @@ -38,10 +38,10 @@ class TorracatModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torracat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torracat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torracat", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("torracat", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt index b25f21c071..bc5ef25a50 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt @@ -36,7 +36,7 @@ class TsareenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tsareena", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tsareena", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt index 0a6a46bc77..dd9bf05146 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt @@ -38,12 +38,12 @@ class WimpodModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var swimming: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wimpod", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wimpod", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wimpod", "blink").setPreventsIdle(false)} - val leftTwitch = quirk("left_twitch") { bedrockStateful("wimpod", "twitch_quirk_left").setPreventsIdle(false)} - val rightTwitch = quirk("right_twitch") { bedrockStateful("wimpod", "twitch_quirk_right").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("wimpod", "blink")} + val leftTwitch = quirk("left_twitch") { bedrockStateful("wimpod", "twitch_quirk_left")} + val rightTwitch = quirk("right_twitch") { bedrockStateful("wimpod", "twitch_quirk_right")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt index f5b23fc851..cad60e856c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt @@ -30,7 +30,7 @@ class WishiwashiSoloModel (root: ModelPart) : PokemonPoseableModel(){ lateinit var watersleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wishiwashi_solo", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("wishiwashi_solo", "blink") } watersleep = registerPose( poseType = PoseType.SLEEP, condition = { it.isTouchingWater }, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt index b7286795a4..383790bbb8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt @@ -42,7 +42,7 @@ class AlcremieModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bim val shoulderOffset = 5.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("alcremie", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("alcremie", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("alcremie", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt index 8170250d7c..ba1311db99 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt @@ -33,8 +33,8 @@ class ArrokudaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var waterbattleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("arrokuda", "blink").setPreventsIdle(false)} - val flop = quirk("flop") { bedrockStateful("arrokuda", "ground_quirk").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("arrokuda", "blink")} + val flop = quirk("flop") { bedrockStateful("arrokuda", "ground_quirk")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt index df1533d41f..b8166ac7be 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt @@ -33,7 +33,7 @@ class BarraskewdaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var waterbattleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("barraskewda", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("barraskewda", "blink")} sleep = registerPose( poseName = "sleeping", transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt index 1f3a9b1079..83290d6bb0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt @@ -33,10 +33,10 @@ class BoltundModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boltund", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boltund", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("boltund", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("boltund", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("boltund", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt index f74ddb6283..7ed1b8d34d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt @@ -36,10 +36,10 @@ class CinderaceModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cinderace", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cinderace", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cinderace", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cinderace", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt index f45e2cc4a4..0b3ee0c306 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt @@ -45,10 +45,10 @@ class CorviknightModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corviknight", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corviknight", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("corviknight", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("corviknight", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("corviknight", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt index 900e71d556..294734316a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt @@ -40,11 +40,11 @@ class CorvisquireModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corvisquire", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corvisquire", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("corvisquire", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("corvisquire", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("corvisquire", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt index fae0b7d24c..5bdd465d36 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt @@ -39,10 +39,10 @@ class DrizzileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("drizzile", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("drizzile", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("drizzile", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("drizzile", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt index 85fa45b2dd..f50d438b26 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt @@ -43,10 +43,10 @@ class DubwoolModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var shearedstanding: PokemonPose lateinit var shearedwalk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dubwool", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dubwool", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dubwool", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("dubwool", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt index e817c56fd5..14503bda4b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt @@ -32,7 +32,7 @@ class EiscueModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("eiscue_ice", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("eiscue_ice", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt index e142747fa7..b5f88ff488 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt @@ -29,12 +29,12 @@ class FalinksModel (root: ModelPart) : PokemonPoseableModel(){ lateinit var uipose: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("falinks", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("falinks", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink3") { bedrockStateful("falinks", "blink3").setPreventsIdle(false) } - val blink4 = quirk("blink4") { bedrockStateful("falinks", "blink4").setPreventsIdle(false) } - val blink5 = quirk("blink5") { bedrockStateful("falinks", "blink5").setPreventsIdle(false) } - val blink6 = quirk("blink6") { bedrockStateful("falinks", "blink6").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("falinks", "blink") } + val blink2 = quirk("blink2") { bedrockStateful("falinks", "blink2") } + val blink3 = quirk("blink3") { bedrockStateful("falinks", "blink3") } + val blink4 = quirk("blink4") { bedrockStateful("falinks", "blink4") } + val blink5 = quirk("blink5") { bedrockStateful("falinks", "blink5") } + val blink6 = quirk("blink6") { bedrockStateful("falinks", "blink6") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt index 6129ca6e1c..829ffddea8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt @@ -40,10 +40,10 @@ class GrookeyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grookey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grookey", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grookey", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("grookey", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt index 8e1e289edc..ba9e16efc8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt @@ -38,10 +38,10 @@ class InteleonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("inteleon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("inteleon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("inteleon", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("inteleon", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt index 0abd9cc10c..1977c99e65 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt @@ -34,7 +34,7 @@ class KleavorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kleavor", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("kleavor", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt index 1fc42b7d07..1d4d87fa01 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt @@ -39,14 +39,14 @@ class NickitModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nickit", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nickit", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nickit", "blink").setPreventsIdle(false)} - val glanceleft = quirk("glanceleft") { bedrockStateful("nickit", "quirk_shiftyglance_left").setPreventsIdle(false)} - val glanceright = quirk("glanceright") { bedrockStateful("nickit", "quirk_shiftyglance_right").setPreventsIdle(false)} - val eartwitchleft = quirk("eartwitchleft") { bedrockStateful("nickit", "quirk_eartwitch_left").setPreventsIdle(false)} - val eartwitchright = quirk("eartwitchright") { bedrockStateful("nickit", "quirk_eartwitch_right").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("nickit", "blink")} + val glanceleft = quirk("glanceleft") { bedrockStateful("nickit", "quirk_shiftyglance_left")} + val glanceright = quirk("glanceright") { bedrockStateful("nickit", "quirk_shiftyglance_right")} + val eartwitchleft = quirk("eartwitchleft") { bedrockStateful("nickit", "quirk_eartwitch_left")} + val eartwitchright = quirk("eartwitchright") { bedrockStateful("nickit", "quirk_eartwitch_right")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt index 0b9c85f7cd..58408b088e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt @@ -34,7 +34,7 @@ class ObstagoonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("obstagoon", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("obstagoon", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt index 5c520ea9e9..6d089173af 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt @@ -41,7 +41,7 @@ class PerrserkerModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("perrserker", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("perrserker", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt index 9fa9fba11a..ee70888b9f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt @@ -36,10 +36,10 @@ class RabootModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raboot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raboot", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raboot", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("raboot", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt index cb529ca141..6f6eb62000 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt @@ -41,10 +41,10 @@ class RillaboomModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rillaboom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rillaboom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rillaboom", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("rillaboom", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt index 4cd2b40ece..d9932de67f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt @@ -38,10 +38,10 @@ class RookideeModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWi lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rookidee", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rookidee", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rookidee", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("rookidee", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rookidee", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt index a98c857161..910b921580 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt @@ -38,10 +38,10 @@ class ScorbunnyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi // lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scorbunny", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scorbunny", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scorbunny", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("scorbunny", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("scorbunny", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt index 1fa7cb8395..90b54cdfa9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt @@ -9,6 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen8 import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider @@ -34,11 +35,11 @@ class SirfetchdModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sirfetchd", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sirfetchd", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sirfetchd", "blink").setPreventsIdle(false) } - val swag = quirk("swag") { bedrockStateful("sirfetchd", "quirk").setPreventsIdle(true) } + val blink = quirk("blink") { bedrockStateful("sirfetchd", "blink") } + val swag = quirk("swag") { PrimaryAnimation(bedrockStateful("sirfetchd", "quirk")) } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt index d8231db523..5937e00759 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt @@ -36,10 +36,10 @@ class SobbleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sobble", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sobble", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sobble", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("sobble", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt index 459b05da52..9816d75013 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt @@ -37,11 +37,11 @@ class ThievulModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thievul", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thievul", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("thievul", "blink").setPreventsIdle(false)} - val sleepquirk = quirk("sleepquirk") { bedrockStateful("thievul", "quirk_sleep").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("thievul", "blink")} + val sleepquirk = quirk("sleepquirk") { bedrockStateful("thievul", "quirk_sleep")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt index 763e5bce11..2a84afd7a8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt @@ -42,10 +42,10 @@ class ThwackeyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thwackey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thwackey", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("thwackey", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("thwackey", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt index 0e88c66cda..ff39a52fe1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt @@ -37,7 +37,7 @@ class UrsalunaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ursaluna", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ursaluna", "cry") } override fun registerPoses() { // sleep = registerPose( @@ -45,7 +45,7 @@ class UrsalunaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua // idleAnimations = arrayOf(bedrock("ursaluna", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("ursaluna", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ursaluna", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt index 65ed7a27c6..73b31e6c3c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt @@ -40,10 +40,10 @@ class WoolooModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var shearedstanding: PokemonPose lateinit var shearedwalk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooloo", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooloo", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wooloo", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("wooloo", "blink") } standing = registerPose( poseName = "standing", poseTypes = setOf(PoseType.NONE, PoseType.STAND, PoseType.PORTRAIT, PoseType.PROFILE), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt index d8a4303578..37fd68ecaf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt @@ -36,7 +36,7 @@ class WyrdeerModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wyrdeer", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("wyrdeer", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt index 4621a5eeb1..7f6250a246 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt @@ -36,10 +36,10 @@ class YamperModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamper", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamper", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("yamper", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("yamper", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt index 4449292a5c..ac0e942d19 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt @@ -38,10 +38,10 @@ class AnnihilapeModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bi lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("annihilape", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("annihilape", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("annihilape", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("annihilape", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt index c05d0a631c..15ae2a07d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt @@ -43,10 +43,10 @@ class ArmarougeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("armarouge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("armarouge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("armarouge", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("armarouge", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("armarouge", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt index 5482d1c16f..0497a604e7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt @@ -48,10 +48,10 @@ class CeruledgeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ceruledge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ceruledge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ceruledge", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ceruledge", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformedParts = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt index 6f180fb513..1cbc4525ae 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt @@ -35,10 +35,10 @@ class CetitanModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetitan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetitan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cetitan", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cetitan", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cetitan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt index 2989757e4f..acc75891b2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt @@ -35,10 +35,10 @@ class CetoddleModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetoddle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetoddle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cetoddle", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("cetoddle", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cetoddle", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt index 7349b3b22e..c3948d1f49 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt @@ -42,10 +42,10 @@ class CharcadetModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walking: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charcadet", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charcadet", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charcadet", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("charcadet", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("charcadet", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt index 72a7ddd957..b1fb9b8492 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt @@ -38,10 +38,10 @@ class ClodsireModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clodsire", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clodsire", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("clodsire", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("clodsire", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt index e09e5cfe8c..56a1b01582 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt @@ -31,10 +31,10 @@ class CrocalorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame{ lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crocalor", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crocalor", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("crocalor", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("crocalor", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("crocalor", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt index cdf8510225..b54432ecbc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt @@ -39,10 +39,10 @@ class DachsbunModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dachsbun", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dachsbun", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dachsbun", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("dachsbun", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt index 90106be189..cd1a725624 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt @@ -35,10 +35,10 @@ class EspathraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espathra", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espathra", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("espathra", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("espathra", "blink") } sleep = registerPose( poseName = "sleep", poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt index 015e74de5f..c133ce9f63 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt @@ -39,10 +39,10 @@ class FidoughModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fidough", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fidough", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fidough", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("fidough", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt index 673f06618e..51bb406d79 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt @@ -41,10 +41,10 @@ class FlittleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffsetX = 6 val shoulderOffsetY = 6 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flittle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flittle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("flittle", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("flittle", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("flittle", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt index 264864cf99..12c041a1ff 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt @@ -31,10 +31,10 @@ class FloragatoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("floragato", "battle_cry").setPreventsIdle(false) else bedrockStateful("floragato", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("floragato", "battle_cry") else bedrockStateful("floragato", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("floragato", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("floragato", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("floragato", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt index 19bc4f962b..ff8ac1ee49 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt @@ -33,10 +33,10 @@ class FuecocoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fuecoco", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fuecoco", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fuecoco", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("fuecoco", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("fuecoco", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt index 2b1143f29e..b245cc0de1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt @@ -41,7 +41,7 @@ class GarganaclModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose lateinit var portrait: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("garganacl", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("garganacl", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt index c9ded882ad..380954c68f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt @@ -30,10 +30,10 @@ class GlimmetModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmet", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmet", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("glimmet", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("glimmet", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("glimmet", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt index 979e869972..5722afe915 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt @@ -31,10 +31,10 @@ class GlimmoraModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmora", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmora", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("glimmora", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("glimmora", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("glimmora", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt index 66a3e620ed..3b133ab495 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt @@ -30,10 +30,10 @@ class GrafaiaiModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grafaiai", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grafaiai", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grafaiai", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("grafaiai", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt index 1eb0f1ce7a..a65f5a7223 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt @@ -34,7 +34,7 @@ class IronleavesModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ironleaves", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("ironleaves", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt index d54435c9f4..f8776689eb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt @@ -40,7 +40,7 @@ class LechonkModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { // idleAnimations = arrayOf(bedrock("lechonk", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("lechonk", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("lechonk", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt index 8374f00715..303afb145b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt @@ -36,10 +36,10 @@ class MabosstiffModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Q lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mabosstiff", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mabosstiff", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mabosstiff", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("mabosstiff", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt index e2355f3d1b..4a4b16e043 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt @@ -36,10 +36,10 @@ class MaschiffModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maschiff", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maschiff", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("maschiff", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("maschiff", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt index 0c7694855d..da2e82b8bf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt @@ -34,9 +34,9 @@ class MausholdModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("maushold_four", "blink1").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("maushold_four", "blink2").setPreventsIdle(false)} - val blink3 = quirk("blink3") { bedrockStateful("maushold_four", "blink3").setPreventsIdle(false)} + val blink1 = quirk("blink1") { bedrockStateful("maushold_four", "blink1")} + val blink2 = quirk("blink2") { bedrockStateful("maushold_four", "blink2")} + val blink3 = quirk("blink3") { bedrockStateful("maushold_four", "blink3")} val head2 = object : HeadedFrame { override val rootPart = this@MausholdModel.rootPart diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt index 8270b1c2a5..1d88970b0c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt @@ -34,10 +34,10 @@ class MausholdfourModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("maushold_four", "blink1").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("maushold_four", "blink2").setPreventsIdle(false)} - val blink3 = quirk("blink3") { bedrockStateful("maushold_four", "blink3").setPreventsIdle(false)} - val blink4 = quirk("blink4") { bedrockStateful("maushold_four", "blink4").setPreventsIdle(false)} + val blink1 = quirk("blink1") { bedrockStateful("maushold_four", "blink1")} + val blink2 = quirk("blink2") { bedrockStateful("maushold_four", "blink2")} + val blink3 = quirk("blink3") { bedrockStateful("maushold_four", "blink3")} + val blink4 = quirk("blink4") { bedrockStateful("maushold_four", "blink4")} val head2 = object : HeadedFrame { override val rootPart = this@MausholdfourModel.rootPart diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt index 79a1cdcc30..7018aadf1c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt @@ -31,14 +31,14 @@ class MeowscaradaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meowscarada", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meowscarada", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowscarada", "blink").setPreventsIdle(false) } - val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk").setPreventsIdle(false) } - val sleep2 = quirk("sleep2", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("meowscarada", "sleep_quirk2").setPreventsIdle(false) } - val sleep3 = quirk("sleep3", secondsBetweenOccurrences = 20F to 60F) { bedrockStateful("meowscarada", "sleep_quirk3").setPreventsIdle(false) } - val sleep4 = quirk("sleep4", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk4").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("meowscarada", "blink") } + val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk") } + val sleep2 = quirk("sleep2", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("meowscarada", "sleep_quirk2") } + val sleep3 = quirk("sleep3", secondsBetweenOccurrences = 20F to 60F) { bedrockStateful("meowscarada", "sleep_quirk3") } + val sleep4 = quirk("sleep4", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk4") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt index 603dcc1a37..8a44709e44 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt @@ -31,7 +31,7 @@ class NacliModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nacli", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nacli", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt index fa4ee4f844..3160a6f0c4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt @@ -36,7 +36,7 @@ class NaclstackModel(root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("naclstack", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("naclstack", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt index 9495b0cda7..c42224d154 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt @@ -42,7 +42,7 @@ class OinkologneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Q // idleAnimations = arrayOf(bedrock("oinkologne", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("oinkologne", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("oinkologne", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt index a16a823c7a..40c44831a2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt @@ -39,10 +39,10 @@ class QuaquavalModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaquaval", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaquaval", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quaquaval", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("quaquaval", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("quaquaval", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt index 6387b9d868..aa5f31b9f6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt @@ -47,10 +47,10 @@ class QuaxlyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF val wateroffset = -10 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxly", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxly", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quaxly", "blink").setPreventsIdle(false)} + val blink = quirk("blink") { bedrockStateful("quaxly", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt index 1dc5e23f58..c3d1956c69 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt @@ -34,10 +34,10 @@ class QuaxwellModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxwell", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxwell", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quaxwell", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("quaxwell", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("quaxwell", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt index fc3d7d9ba5..7c1093ed21 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt @@ -28,10 +28,10 @@ class RevavroomModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("revavroom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("revavroom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("revavroom", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("revavroom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("revavroom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt index ef00ab7045..0dd04f794f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt @@ -28,10 +28,10 @@ class ShroodleModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroodle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroodle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shroodle", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("shroodle", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt index fdd99b1b2b..e101912f63 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt @@ -29,10 +29,10 @@ class SkeledirgeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skeledirge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skeledirge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("skeledirge", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("skeledirge", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("skeledirge", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt index dd99b9695b..433567645d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt @@ -31,12 +31,12 @@ class SprigatitoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sprigatito", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sprigatito", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sprigatito", "blink").setPreventsIdle(false) } - val earTwitchRight = quirk("ear_twitch_right", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-left").setPreventsIdle(false) } - val earTwitchLeft = quirk("ear_twitch_left", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-right").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("sprigatito", "blink") } + val earTwitchRight = quirk("ear_twitch_right", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-left") } + val earTwitchLeft = quirk("ear_twitch_left", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-right") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(earTwitchRight, earTwitchLeft), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt index bcb9093eb4..68b7e50a62 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt @@ -46,12 +46,12 @@ class SquawkabillyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var shoulderLeft: PokemonPose lateinit var shoulderRight: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squawkabilly", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squawkabilly", "cry") } val shoulderOffsetX = -1.0 val shoulderOffsetY = 0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("squawkabilly", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("squawkabilly", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt index a14dffc4c8..d53c59c444 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt @@ -33,12 +33,12 @@ class TandemausModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose // lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tandemaus", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tandemaus", "cry") } override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("tandemaus", "blink1").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("tandemaus", "blink2").setPreventsIdle(false)} + val blink1 = quirk("blink1") { bedrockStateful("tandemaus", "blink1")} + val blink2 = quirk("blink2") { bedrockStateful("tandemaus", "blink2")} val head2 = object : HeadedFrame { override val rootPart = this@TandemausModel.rootPart diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt index 81217b840c..a74a16849d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt @@ -30,7 +30,7 @@ class TatsugiriModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tatsugiri", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tatsugiri", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt index d06345d4b8..7b8c4d6357 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt @@ -45,10 +45,10 @@ class TinkatinkModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi val shoulderOffset = 1 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatink", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatink", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tinkatink", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tinkatink", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt index e63dcb2606..1565b1bc4f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt @@ -39,10 +39,10 @@ class TinkatonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkaton", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkaton", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tinkaton", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tinkaton", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("tinkaton", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt index 2a86bba30e..0dc38e284d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt @@ -39,10 +39,10 @@ class TinkatuffModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatuff", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatuff", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tinkatuff", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("tinkatuff", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("tinkatuff", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt index 7237781cea..980735298b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt @@ -28,10 +28,10 @@ class VaroomModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("varoom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("varoom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("varoom", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("varoom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("varoom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt index a6b2e5dc92..8fc2547803 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt @@ -52,7 +52,7 @@ class WalkingwakeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, idleAnimations = arrayOf(bedrock("walkingwake", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("walkingwake", "blink").setPreventsIdle(false) } + val blink = quirk("blink") { bedrockStateful("walkingwake", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt index ee7f3c2b53..22d3a093db 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt @@ -38,9 +38,9 @@ class Pose( idleAnimations.forEach { it.apply(null, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity) } } - fun idleStateful(entity: T?, model: PoseableEntityModel, state: PoseableEntityState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { + fun idleStateful(entity: T?, model: PoseableEntityModel, state: PoseableEntityState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float) { idleAnimations.filter { state.shouldIdleRun(it, 0F) }.forEach { idleAnimation -> - idleAnimation.apply(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity * state.getIdleIntensity(idleAnimation)) + idleAnimation.apply(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, state.getIdleIntensity(idleAnimation)) } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt index 26374d5832..96c4b1e3fa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt @@ -10,13 +10,18 @@ package com.cobblemon.mod.common.client.render.models.blockbench.quirk import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation import net.minecraft.entity.Entity open class QuirkData(val name: String) { val animations = mutableListOf>() + var primaryAnimation: PrimaryAnimation? = null open fun run(entity: T?, model: PoseableEntityModel, state: PoseableEntityState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { + if (primaryAnimation != null && state.primaryAnimation != primaryAnimation) { + primaryAnimation = null + } animations.removeIf { !it.run(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity) } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt index 889eaec9d8..96df302f3c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt @@ -9,10 +9,12 @@ package com.cobblemon.mod.common.client.render.models.blockbench.quirk import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation import com.cobblemon.mod.common.util.math.random import kotlin.random.Random import net.minecraft.entity.Entity + class SimpleQuirk( name: String, private val secondsBetweenOccurrences: Pair, @@ -22,7 +24,7 @@ class SimpleQuirk( ) : ModelQuirk>(name) { override fun createData(): SimpleQuirkData = SimpleQuirkData(name) override fun tick(state: PoseableEntityState, data: SimpleQuirkData) { - if (data.animations.isNotEmpty()) { + if (data.animations.isNotEmpty() || data.primaryAnimation != null) { return } @@ -31,7 +33,7 @@ class SimpleQuirk( } if (data.remainingLoops > 0) { - data.animations.addAll(animations(state)) + applyAnimations(state, data) data.remainingLoops-- } @@ -40,7 +42,7 @@ class SimpleQuirk( // Is it time? if (data.nextOccurrenceSeconds <= state.animationSeconds) { data.remainingLoops = loopTimes.random() - 1 - data.animations.addAll(animations(state)) + applyAnimations(state, data) data.nextOccurrenceSeconds = -1F } } else { @@ -48,4 +50,14 @@ class SimpleQuirk( } } } + + private fun applyAnimations(state: PoseableEntityState, data: SimpleQuirkData) { + val (primary, stateful) = animations(state).partition { it is PrimaryAnimation } + data.animations.addAll(stateful) + if (primary.isNotEmpty()) { + val primaryAnimation = primary.first() as PrimaryAnimation + data.primaryAnimation = primaryAnimation + state.addPrimaryAnimation(primaryAnimation) + } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt index 10f58e73fa..56f4f220af 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt @@ -86,3 +86,28 @@ fun parabolaFunction( } } +object WaveFunctions { + val functions = mutableMapOf( + "symmetrical" to { t -> + if (t < 0.1) { + t * 10 + } else if (t < 0.9) { + 1F + } else { + 1F - (t - 0.9F) * 10 + } + }, + "symmetrical_wide" to { t -> + if (t < 0.2) { + val t2 = t * 5 + 0.5F * sin(PI*(t2 - 0.5F)) + 0.5F + } else if (t < 0.8) { + 1F + } else { + val t2 = (1 - t) * 5 + 1F - (0.5F * sin(PI*(t2 - 0.5F)) + 0.5F) + } + }, + "one" to { 1F } + ) +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt index 2638470948..5e8ad2637b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt @@ -42,16 +42,16 @@ abstract class PokeBallPoseableState : PoseableEntityState( } EmptyPokeBallEntity.CaptureState.FALL -> {} EmptyPokeBallEntity.CaptureState.SHAKE -> { - doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", "bounce").setPreventsIdle(false)) } + doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", "bounce")) } shakeEmitter .pipe(Observable.emitWhile { stateEmitter.get() == EmptyPokeBallEntity.CaptureState.SHAKE }) .subscribe { val bob = "bob${Random.Default.nextInt(6) + 1}" - doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", bob).setPreventsIdle(false)) } + doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", bob)) } } } - EmptyPokeBallEntity.CaptureState.CAPTURED -> doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", "capture").setPreventsIdle(false)) } - EmptyPokeBallEntity.CaptureState.CAPTURED_CRITICAL -> doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", "critical").setPreventsIdle(false)) } + EmptyPokeBallEntity.CaptureState.CAPTURED -> doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", "capture")) } + EmptyPokeBallEntity.CaptureState.CAPTURED_CRITICAL -> doLater { setStatefulAnimations(currentModel!!.bedrockStateful("poke_ball", "critical")) } else -> {} } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt index b3939500fd..5b15930a06 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt @@ -60,4 +60,13 @@ fun JsonElement.asNbt(): NbtElement = JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE fun > Array.getFromJSON(element: JsonElement, name: String): T { val type = (element as JsonObject).get(name).asString return first { type.equals(it.name, ignoreCase = true) } +} + +fun JsonObject.getFirst(vararg names: String): JsonElement? { + for (name in names) { + val element = get(name) + if (element != null) + return element + } + return null } \ No newline at end of file diff --git a/utilityscripts/cobblemon_cry_checker.py b/utilityscripts/cobblemon_cry_checker.py index dc1591e30d..0f4154f280 100644 --- a/utilityscripts/cobblemon_cry_checker.py +++ b/utilityscripts/cobblemon_cry_checker.py @@ -87,7 +87,7 @@ def main(print_missing_models=False, print_missing_animations=False): invalid_model_files.append(("Missing import", model_file_path.replace( '../common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/', ""))) - elif f'override val cryAnimation = CryProvider {{ _, _ -> bedrockStateful("{sanitized_pokemon_name_lower}", "cry").setPreventsIdle(false) }}' not in content: + elif f'override val cryAnimation = CryProvider {{ _, _ -> bedrockStateful("{sanitized_pokemon_name_lower}", "cry") }}' not in content: if "override val cryAnimation = CryProvider {" not in content or 'bedrockStateful("' not in content: invalid_model_files.append(("Missing cryAnimation override", model_file_path.replace( '../common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/',