Commit Graph

643 Commits

Author SHA1 Message Date
Thalia Nero 9d82f4bcc4 Map ChunkStatusChangeListener. 2020-11-06 20:19:18 -05:00
Thalia Nero 4699e0991e Map more entity loading stuff. 2020-11-06 20:11:11 -05:00
Thalia Nero 8a30358ef2 Merge branch '20w45a' of github.com:FabricMC/yarn into world-entity 2020-11-06 18:10:03 -05:00
enbrain e308a8a7f5
Add mappings for class_5539 (HeightLimitView) (#1850)
* Add mappings for class_5539 (HeightLimit)

* HeightLimit -> HeightLimitView
2020-11-06 14:27:29 +00:00
Shnupbups 1e46390347
20w45a things (#1833)
* Things

* Update AbstractCauldronBlock.mapping

* a few more things

* Create EntityModelLayers.mapping

* Update MinecraftVersion.mapping

* Update Oxidizable.mapping
2020-11-06 14:24:34 +00:00
AlexIIL dd60a9b973
BlockEntity tick and creation (#1836)
* Minor BlockEntity ticking names.

* And some more.

* More.

* More.

* Map a lot more BlockEntity.tick methods.

* World mappings.

* Javadoc for BlockWithEntity.checkTYpe.

* Name params.

* Map BlockEntityType.class_5559 as BlockEntityCreator

* Rename BeehiveBlockEntity.tick to tickServer as it's not used on the client.

* WorldChunk.emptyBlockEntityTicker -> EMPTY_BLOCK_ENTITY_TICKER

* tickServer -> serverTick and tickClient -> clientTick

* WorldChunk.method_31718 -> wrapTicker (rather than createTicker, as this is more accurate).

* Map WorldChunk.method_31715 as canTickBlockEntities.

* DirectBlockEntityTicker -> BlockEntitytTickInvoker

* "ChunkBlockEntityTicker" -> "BlockEntityTickInvoker".

* Bring back "direct" instead of "impl".

* "null*" -> "empty*"

* BlockEntityCreator -> BlockEntityFactory.

* CampfireBlockEntity: tickUnlit/tickLit -> unlitServerTick/litServerTick

* creator/supplier -> factory in BlockEntityType.
2020-11-06 12:49:58 +00:00
Thalia Nero 6d0aa8cff7 Map a lot of entity world interaction shenanigans. Feeling tired might remap later. 2020-11-06 03:43:11 -05:00
SuperCoder79 0d97db6c61
Geode and geode generation mappings (#1847) 2020-11-05 23:40:41 +00:00
i509VCB 081cd51667
Initial entity management mappings (#1845)
There are a few unnamed classes but I feel those need a further look for their purpose or discussion on proper names.
2020-11-05 23:40:31 +00:00
modmuss50 c91f482141 20w45a 2020-11-04 20:44:22 +00:00
SuperCoder79 74ebdcabf0
Worldgen Mappings (#1782)
* lots of world gen mappings

* Apply suggestions from code review

Co-authored-by: YanisBft <doublecraft.official@gmail.com>

* Apply more changes

Co-authored-by: YanisBft <doublecraft.official@gmail.com>
2020-11-04 20:27:44 +00:00
enbrain 0a9f3ddaba
Update World.mapping (#1708)
* Update World.mapping

* Update World.mapping

* horizontally -> vertically
2020-11-03 18:15:22 +00:00
YanisBft 7ca052e978
Biome sources, chunk generators and level things (#1786) 2020-10-19 20:02:02 +01:00
haykam821 17aa1fd5dc
Fix the IdListPalette.fallback field not matching the parameter name (#1781) 2020-10-11 15:59:50 +01:00
haykam821 3c373a9870
Fix some static final fields not having uppercase names (#1780)
* Fix some static final fields not having uppercase names

* Fix typo in capitalization of static final message field

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
2020-10-08 08:51:44 +01:00
YanisBft ea049cb570
Mapped MultiNoiseBiomeSource (#1775) 2020-10-05 22:37:02 +01:00
YanisBft 398c55be36
Feature classes (#1758) 2020-10-02 19:36:19 +01:00
ye-yu afe9d70e5c
Remap LevelStorage parser and getter methods (#1762) 2020-10-02 19:36:11 +01:00
enbrain 82942a674f
Add mappings for SurfaceBuilder (#1748) 2020-09-25 11:31:16 +01:00
enbrain 83826a2a20
Add mappings for Feature (#1751)
* Add mappings for Feature

* generator -> chunkGenerator

Co-authored-by: YanisBft <doublecraft.official@gmail.com>

Co-authored-by: YanisBft <doublecraft.official@gmail.com>
2020-09-11 18:40:13 +01:00
Pyrofab 944e8bf84c
Map missing client collision methods (#1710)
* Map missing client collision methods

* wouldSuffocateAt -> wouldCollideAt

* Remove spurious space

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Fix duplicate method mapping

* Unify overloads of isSpaceEmpty

* Differenciate block-only emptiness checks

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-09-02 21:27:47 +01:00
enbrain 4e4c5957b6
Add mappings to DefaultBiomeCreator (#1736) 2020-09-02 21:27:33 +01:00
i509VCB 577ff9ccbf
Assorted mappings, mainly enchanting, some rendering params and generator type. (#1671)
* Assorted mappings, mainly enchanting, some rendering params and generator type.

(cherry picked from commit b573c98c68)

* Back to consumer

* drop empty comments

* yeet broken

* oops2

* Update World.mapping
2020-08-31 00:37:36 +01:00
YanisBft 4c75a2df53
Random worldgen (#1728) 2020-08-30 11:07:55 +01:00
enbrain d4ee30578b
Add getSkyAngle mapping (#1734) 2020-08-30 11:05:18 +01:00
TheBrokenRail f16f3a8551
Add Mapping For Valid Frame Block Predicate In AreaHelper (#1719) 2020-08-27 09:21:05 +01:00
enbrain 5f460cbebf
Add debugWorld mappings (#1722) 2020-08-27 09:20:57 +01:00
AppleTheGolden 6db313ddaa
rayTrace -> raycast (#1700)
* rayTrace -> rayCast

* rayTrace -> raytrace

* RayCastContext -> RaycastContext

Signed-off-by: liach <liach@users.noreply.github.com>

Co-authored-by: liach <liach@users.noreply.github.com>
2020-08-23 22:04:34 +01:00
Yanis48 4a5198a909
Block placer & state provider classes (#1695) 2020-08-16 12:46:06 +01:00
Yanis48 1dab54ff05
Foliage placer classes (#1694) 2020-08-16 12:44:44 +01:00
Yanis48 ee1d477e18
1 outer class, 3 inner classes & some moves (#1679)
* 1 outer class, 3 inner classes & some moves

* moved AreaHelper to world.dimension
2020-08-16 12:43:46 +01:00
Vincent Lee e743d32da7
Minor POI fixups (#1689) 2020-08-16 12:43:08 +01:00
Joseph Burton ce3fb18a89
Biome class renames (#1681) 2020-08-13 18:12:37 +01:00
Joseph Burton 54fefe633e
Fix all spelling errors in yarn* since 1.16 (#1683)
* Fix spelling errors

* WarnList -> Warnlist
2020-08-13 18:12:27 +01:00
i509VCB d259d20a26
Some nullable client field docs, and other misc docs (#1617)
* Some nullable client field docs, and other misc docs

* Update mappings/net/minecraft/world/World.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-08-12 08:21:57 +01:00
Yanis48 ad77bf8c17
Worldgen again (#1672)
* Worldgen again

* renaming

* BuiltIn -> Builtin

* avoid conflicts
2020-08-12 08:20:28 +01:00
Mysterious_Dev b41e845fc1
[1.16.2-rc1] class_5434 ->JigsawFeature (#1665)
* Begin Mapping

* Continuation of mapping

* Fix name and package location
2020-08-08 18:33:59 +01:00
Shnupbups 2d7ec27850
Biome things (#1660)
* biome things

* Update DefaultBiomes.mapping

* DefaultBiomes -> BuiltInBiomes

per liach's request

* Apply suggestions from code review

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-08-07 19:32:38 +01:00
Yanis48 53cb803fda
Worldgen stuff (#1664)
* Worldgen stuff

* sky properties
2020-08-07 19:32:09 +01:00
modmuss50 7f0d3ff088 1.16.2-rc1 2020-08-07 17:13:30 +01:00
Yanis48 1dc294f267
Made builtin registries match existing names (#1661)
* Made builtin registries match existing names

* mistakes
2020-08-06 18:25:32 +01:00
modmuss50 29ae1599a6 1.16.2-pre3 2020-08-06 18:19:50 +01:00
modmuss50 a1347ccd43 1.16.2-pre2 2020-08-05 18:08:42 +01:00
Yanis48 5821168dcc
ChunkGeneratorType -> ChunkGeneratorSettings (#1628)
* ChunkGeneratorType -> NoiseSettings

* NoiseSettings -> ChunkGeneratorSettings

* Update BuiltinRegistries.mapping

* NoiseConfig -> GenerationShape

* GenerationShapeConfig
2020-08-05 17:40:41 +01:00
i509VCB 48b45b314a
Map some lunar cycle related logic. (#1638)
* Map some lunar cycle related logic.

* Update mappings/net/minecraft/world/dimension/DimensionType.mapping

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Update mappings/net/minecraft/world/LunarWorldView.mapping

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

* Moon phases was decided

* getLunarTime is better

* Update mappings/net/minecraft/world/dimension/DimensionType.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/world/dimension/DimensionType.mapping

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-08-02 09:34:56 +01:00
Yanis48 5e5c59dbe5
Biomes strike again (#1632) 2020-07-30 11:16:34 +01:00
modmuss50 04b555a4ff 1.16.2-pre1 2020-07-29 16:36:02 +01:00
Yanis48 a107de2eda
Quick structure mappings (#1615) 2020-07-28 20:13:50 +01:00
i509VCB 0a5eb209da
ServerWorldAccess is different now (#1618)
* ServerWorldAccess is different now

* Update mappings/net/minecraft/world/ServerWorldAccess.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/world/ServerWorldAccess.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-07-28 20:13:43 +01:00
Gegy d51da147c1
Refactors to ThreadedAnvilChunkStorage and ChunkHolder generation logic (#1542)
* Refactors to ThreadedAnvilChunkStorage and ChunkHolder generation logic

* revert statusListeners

* improve consistency of future-returning functions

* ChunkHolder.ticking -> accessible

* Update ChunkStatus "distance from full" mappings and name ChunkHolder#future more specific to saving

* Remove `await` prefix for consistency
2020-07-28 20:13:22 +01:00
haykam821 a83a057fe4
Map unmapped fields that have getter methods (#1612)
* Map unmapped fields that have getter methods

* Fix the parts field in GhastEntityModel using the same name as its getter method

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update outdated getter method names

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-07-27 19:44:57 +01:00
Juuxel 9ff1824815
Decorators and other small world gen mappings (#1610) 2020-07-26 15:39:03 +01:00
i509VCB 2b4527de0a
ServerWorldAccess -> StructureWorldAccess (#1587)
* world boogaloo

* Now StructureWorldAccess
2020-07-26 15:23:50 +01:00
Yanis48 c17238b5ed
(Almost) fully mapped Biome and BiomeEffects (#1607) 2020-07-25 14:38:22 +01:00
Yanis48 d5e0e1709e
Some biome mappings (#1603)
* Some biome mappings

* weather inner class
2020-07-24 00:50:08 +01:00
SuperCoder79 5d5a8c2aaa
chunk generator mappings (#1600) 2020-07-23 23:20:03 +01:00
modmuss50 78fcff22ef 20w30a 2020-07-22 17:29:24 +01:00
shartte 7059dcff8d
Fixes mapping issues in LevelInfo (#1594)
* Fixes mapping issues in LevelInfo

* Clarify comment on copied game rules
2020-07-21 22:57:13 +01:00
modmuss50 078ef269e1
All inner classes + misc other things. (#1586)
* All inner classes + misc other things.

* Update mappings/net/minecraft/state/property/Property.mapping

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

* move CharPredicate

* move CharPredicate

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-07-20 16:11:00 +01:00
Yanis48 8a5d3b4c45
Moved tree decorators into their own package (#1579)
* Moved tree decorators into their own package

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* trigger github?

* Update mappings/net/minecraft/world/gen/tree/TreeDecoratorType.mapping

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2020-07-19 15:06:04 +01:00
liach e8dd3900c6
Fix some javadoc warnings (#1592)
There is still some entity view/structure feauture ones, 7 left

Signed-off-by: liach <liach@users.noreply.github.com>

Co-authored-by: liach <liach@users.noreply.github.com>
2020-07-19 15:05:15 +01:00
Juuxel fcf6d66e9e
20w28a worldgen mappings (#1571)
* Some 20w28a worldgen mappings

* Decoratable and UniformIntDistribution

* Remove CountFeatureConfig.mapping

* UniformIntDistribution.createCodec -> createValidatedCodec

* Document UniformIntDistribution.of(int)
2020-07-16 18:06:26 +01:00
Brandcraf06 e64cdb22bd
20w28a ConfiguredFeatures mappings (#1563)
* Create class_5464.mapping

* Rename class_5464 & class_5467

* Apply suggestions

* fix bad merge

* Configs suggestions based on the old "DefaultBiomeFeatures"

* Update mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Apply rename suggestions

* Oops

Co-authored-by: modmuss50 <modmuss50@gmail.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-07-16 16:18:07 +01:00
Thalia Nero fa9df32fd8
Disambiguate and document getEntities methods (#1514)
* Disambiguate and document getEntities methods

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

* Edit param docs

* Edit return docs

* periods are terrible

* Apply suggestions from code review

Changes to some parameter docs to reflect method naming.

Co-authored-by: i509VCB <i509vcb@gmail.com>

* getSurroundingEntities -> getOtherEntities

* clarify 'subclass'

* Some clarification

* Remove unnecessary exception specification

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: i509VCB <i509vcb@gmail.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2020-07-16 16:08:44 +01:00
Yanis48 f0cb45fab9
Spawn angle mappings (#1581) 2020-07-16 15:46:34 +01:00
Joseph Burton 495216bb07
Biome creator mappings (#1582) 2020-07-16 00:58:09 +01:00
modmuss50 8bc6276f19 20w29a 2020-07-15 17:04:53 +01:00
Joseph Burton 7a551e60e3
Dynamic registry manager references (#1577) 2020-07-14 18:31:42 +01:00
Gegy 467bf82f0c
Improvements to lighting engine mappings (#1501)
* Improvements to lighting engine mappings

* Consistency in ChunkLightProvider

* apply some suggestions

* remove skyLight prefixes in SkyLightStorage

* mark paragraphs

* `blockPos` -> `pos`

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* `blockPos` -> `pos`

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-07-12 12:07:22 +01:00
liach a9e6995935
Minecart mappings ported (#1555)
* Minecart related mappings

* Update for new dismounting content

Signed-off-by: liach <liach@users.noreply.github.com>

* Update mappings/net/minecraft/entity/Dismounting.mapping

Co-authored-by: shartte <shartte@users.noreply.github.com>

Co-authored-by: immibis <immibis@gmail.com>
Co-authored-by: liach <liach@users.noreply.github.com>
Co-authored-by: shartte <shartte@users.noreply.github.com>
2020-07-10 18:30:34 +01:00
Shnupbups 4b7ff50bec
Mostly decorator and feature stuff (#1568)
* oh gosh oh heck

* Delete class_5434.mapping

* fixed stuff
2020-07-10 16:35:22 +01:00
i509VCB 283dee7b33
TypeConsumer is actually a visitor (#1566)
* TypeConsumer is actually a visitor

And map that one bootstrap method that uses the visitor

* Use a more passive form, use accept and use "visit" name in the right spots.

And fix it to be standard with naming.

* Indentation

* Update mappings/net/minecraft/world/GameRules.mapping

Co-authored-by: shartte <shartte@users.noreply.github.com>

* Update mappings/net/minecraft/world/GameRules.mapping

Co-authored-by: shartte <shartte@users.noreply.github.com>

Co-authored-by: shartte <shartte@users.noreply.github.com>
2020-07-10 12:59:25 +01:00
Yanis48 017b5ce124
Builtin registries (#1562)
* Dynamic registries

* Dynamic -> Builtin
2020-07-10 12:01:36 +01:00
shartte 099c461aff
Structure Placement (#1552)
* Structure placement

* Enhanced structure mappings

* Added docs to structure start

* Update mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/structure/StructureStart.mapping

Co-authored-by: Gegy <gegy1000@gmail.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Gegy <gegy1000@gmail.com>
2020-07-09 18:44:24 +01:00
Filip Weiss 79511e488a
ServerWorld: add weather and time mappings (#1570)
* ServerWorld: add weather and time mappings

* ServerWorldProperties: set time methods
2020-07-09 18:43:08 +01:00
i509VCB 52bb8ef4aa
Thinking with portals (part 1) (#1569)
* Thinking with portals (part 1)

* match the method name to return type
2020-07-09 11:00:39 +01:00
modmuss50 c8192e4d36 20w28a 2020-07-08 18:49:17 +01:00
shartte db98c187d6
Worldgen Ergonomics (#1550) 2020-07-08 18:36:16 +01:00
i509VCB 12aab80a83
Document some bits of Spawner. (#1547)
* Document some bits of Spawner.

* Update mappings/net/minecraft/world/gen/PillagerSpawner.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* captain

* Update Spawner.mapping

* Update mappings/net/minecraft/world/gen/Spawner.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-07-07 22:52:20 +01:00
Yanis48 4b5dadbafa
Quick fixes (#1534)
* Quick fixes

* Update EntryListWidget.mapping
2020-07-05 13:45:54 +01:00
Shnupbups 8af9ff5509
Piglin Brutes and stuff (#1537)
* Piglin Brutes and stuff

* Delete RenameSwapHandsFix.mapping

* stuff

* Update mappings/net/minecraft/entity/mob/PiglinEntity.mapping

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-07-05 13:45:14 +01:00
Yanis48 e9a00990e5
Map two methods in GeneratorType (#1535)
* Map two methods in GeneratorType

* Update BiomeSource.mapping
2020-07-03 13:20:46 +01:00
modmuss50 b446f6047d 20w27a 2020-07-01 17:44:38 +01:00
i509VCB ec7bed90ba
Some command source docs, remove a few old Registry tracker names and some world data stuff (#1522) 2020-06-30 20:08:39 +01:00
shartte 0345e81ef0
Additional breakBlock overload mapped (#1520) 2020-06-28 12:42:02 +01:00
i509VCB 8a6a1db2ce
Map chunk and chunk statuses (Reattached) (#1511)
* Map chunk and chunk statuses

* Update mappings/net/minecraft/world/chunk/ProtoChunk.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* So we don't have #1493 here

* chunks is fine

* Update mappings/net/minecraft/block/Block.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update ChunkStatus.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
2020-06-26 12:34:45 +01:00
Joseph Burton ddae078fbd
desync -> dsync (#1512) 2020-06-25 20:57:16 +01:00
Juuxel 6ae7f75387
Default structures and minor fixes (#1509)
* Map default structure adders

* Fix incorrect case for static final field in LootTableRanges

* Remove -New suffix from NbtHelper's UUID methods

* Code review
2020-06-25 13:27:28 +01:00
Juuxel 2847e6a8af
1.16-pre5 world gen mappings (#1469)
Some overlap with #1453, but nothing major.
2020-06-24 17:35:17 +01:00
Joseph Burton d3e8fd1935
Fix lots of spelling errors throughout yarn (#1506)
* Fix lots of spelling errors throughout yarn

* Delete empty comment
2020-06-24 17:34:48 +01:00
haykam821 e447c4558d
Fix spacing of 'blockstate' in ModifiableWorld#setBlockState docs (#1497) 2020-06-24 10:10:55 +01:00
i509VCB 13b18dd9da
Re add names to documented rules that were previously autonamed. (#1496) 2020-06-24 10:10:13 +01:00
Alexander 189a20f1dd
Map new ModifiableWorld.setBlockState (#1483) 2020-06-21 22:00:51 +01:00
Yanis48 c72ab7649e
Some fixes (#1481)
* Some fixes

* FeaturePiece -> StructurePiece
2020-06-20 19:51:40 +01:00
i509VCB 476b5d351e
ServerCommandOutput -> RconCommandOutput and a bunch of assorted parameter names (#1475) 2020-06-18 20:16:49 +01:00
modmuss50 a4305ccae9 1.16-pre8 2020-06-17 17:11:43 +01:00
Yanis48 f4848b6cd5
pre3 DimensionType (#1456)
* pre3 DimensionType

* more things

* renamed registry at the same time
2020-06-11 11:35:56 +01:00
modmuss50 49710ba86a 1.16-pre3 2020-06-10 18:05:28 +01:00
modmuss50 4f3d7449a3
Map the remaining inner classes (#1443)
* Map the remaining inner classes

* TooltipSupplier

* PageContent

* Update mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
2020-06-08 20:50:36 +01:00
Kroppeb b506248928
TreeDecorator.getType() (#1445) 2020-06-08 18:24:47 +01:00