EnZaXD
a8d7ab62e3
Add alpha to particle colors in 1.20.3->.5 ( #3827 )
2024-05-06 09:51:41 +02:00
Nassim Jahnke
71313b4753
Simplify raider check in 1.13->1.14 entity data handler
2024-05-06 09:42:49 +02:00
Nassim Jahnke
994bc8eefc
Move down super onMappingDataLoaded calls
2024-05-05 23:15:20 +02:00
Nassim Jahnke
e993be751c
Filter items in entity data with amount < 1
2024-05-05 16:36:46 +02:00
Nassim Jahnke
fc9d5b6d9d
Clean up entriesLength usage
2024-05-05 13:33:21 +02:00
EnZaXD
9549a18cec
Handle duplicated registry ids in 1.20.3->.5 ( #3825 )
...
Minecraft 1.20.4 and earlier silently overrides the previous values if multiple registry elements have the same id (Tested using a Fabric 1.20.4 mod by parsing a registry sent by a server and then printing the parsed objects).
2024-05-05 13:08:09 +02:00
Nassim Jahnke
d691096ce1
Move around types, apply to other enums
...
This doesn't include ALL abstract types, mostly if they are single-use or not at all relevant to our handling and most likely never will
2024-05-05 12:10:57 +02:00
Nassim Jahnke
73ed425bf7
Fixup entity type hierarchy
2024-05-04 18:11:50 +02:00
EnZaXD
cdc9c3ae95
Update mappings ( #3823 )
...
48167fe5b6
2024-05-03 19:12:24 +02:00
EnZaXD
d3af70d76c
Add optional registry utils to TagUtil ( #3819 )
2024-05-02 15:45:19 +02:00
Nassim Jahnke
c00bc6b667
Check both namespaced and implicit key when replacing registry
2024-05-01 10:28:53 +02:00
Nassim Jahnke
fa3c933b2f
Fix banner pattern backup
...
Fixes #3816
2024-05-01 00:06:22 +02:00
Nassim Jahnke
07bb0269c3
Auto: Update copyright headers
2024-04-30 22:23:11 +02:00
Nassim Jahnke
57c0d83608
Clean up component rewriter
2024-04-30 16:09:11 +02:00
Nassim Jahnke
4854b131b8
Some cleanup
2024-04-30 09:02:24 +02:00
Nassim Jahnke
1864b66e42
Handle new banner patterns in backwards translation
2024-04-29 23:58:57 +02:00
Nassim Jahnke
8aa6769193
Handle empty items in item lists
2024-04-29 23:11:10 +02:00
Nassim Jahnke
a77e328dfe
Put components in entity data through component rewriter
...
Cursed, but possibly needed
2024-04-27 21:39:20 +02:00
Gero
9c84e0dbe9
Fix remapping of 1.20.5 CLICK_WINDOW_BUTTON
2024-04-27 21:26:28 +02:00
Nassim Jahnke
66e0453398
Fix block protocols disconnect packet
2024-04-27 12:13:09 +02:00
Nassim Jahnke
7ec6888a30
Handle invalid command argument types
...
The client ignores these presumably for modded servers
Fixes #3806
2024-04-27 11:26:18 +02:00
Nassim Jahnke
c9733948b3
Use raw data filler in 1.12->1.13
2024-04-27 10:23:04 +02:00
Nassim Jahnke
798b70cbe6
Be even more defensive about half valid items in hover events
...
While they aren't particularly useful or intended, they were valid
2024-04-26 19:00:37 +02:00
Nassim Jahnke
a1c182f291
Ignore invalid names in the data component for hover events as well
2024-04-26 10:01:29 +02:00
Nassim Jahnke
8e63fd635b
Ignore invalid names in player heads
2024-04-26 09:29:19 +02:00
FlorianMichael
f422e03348
Rename ranged protocol version names
2024-04-25 20:31:22 +02:00
Nassim Jahnke
fdf735420f
Add enforce-secure-chat setting to determine what is sent to the client by default
2024-04-25 20:21:36 +02:00
Nassim Jahnke
b13fbbe175
Fix various issues in hover events serialization
2024-04-25 10:34:24 +02:00
Nassim Jahnke
3dfcd6b9b9
Fix written book hover serialization
2024-04-24 15:47:56 +02:00
Nassim Jahnke
8df0c0ae2e
Catch component parsing exceptions separately instead of failing the entire item
2024-04-24 15:47:47 +02:00
Nassim Jahnke
d2ca6a82be
Assume enforce secure chat as false by default
...
Setting it to true will result in chat validation errors on the client for other players without chat sessions or valid signatures
2024-04-24 10:26:35 +02:00
Nassim Jahnke
9654a613cd
Put combat kill through component rewriter
2024-04-24 10:15:53 +02:00
Nassim Jahnke
c5e6fa7d0c
Fix trim material ids at tail
2024-04-24 10:11:22 +02:00
Nassim Jahnke
b78f9d350b
Check for lore length, not component length
2024-04-23 23:53:24 +02:00
Nassim Jahnke
ebbe1b6da2
Make backwards enchantment code more readable
2024-04-23 23:44:12 +02:00
Nassim Jahnke
3aed7cb949
Fix mending translation from getting the id from the wrong class
2024-04-23 19:56:17 +02:00
Nassim Jahnke
e2f3dc7572
Limit enchantments to 0-255
2024-04-23 19:32:32 +02:00
Nassim Jahnke
9894671274
Add back default method
2024-04-23 13:47:05 +02:00
Nassim Jahnke
71ab15b331
Serialize to 1.20.3 components in conversion
...
Aside from hover events, only reading of components changed and we need the 1.20.3 hover input. Hover events are already handled by us.
2024-04-23 13:39:15 +02:00
Nassim Jahnke
34bc5b9d36
Put item name and lore through component rewriter
...
An absolute classic moment where servers are putting hover events into not hoverable item names and lore
2024-04-23 13:07:05 +02:00
Nassim Jahnke
b47446d9f7
Merge branch 'refs/heads/dev' into preview
2024-04-23 10:59:45 +02:00
EnZaXD
dcf741a2ba
Fix sound mapping lookup in 1.8->1.9 ( #3801 )
2024-04-23 10:46:40 +02:00
Nassim Jahnke
a4adef3cec
Fix attribute slot handling
2024-04-22 23:57:55 +02:00
Nassim Jahnke
f525ad98e7
Fix handling of sweeping
2024-04-22 16:24:13 +02:00
Nassim Jahnke
d3d6d4f1cd
Fixes to hover event handling, some cleanup
2024-04-22 16:05:44 +02:00
Nassim Jahnke
5069b26c2f
Reuse previously sent enforces-secure-chat value
2024-04-22 16:05:40 +02:00
FlorianMichael
079671060c
Remove items from extra-identifiers-1.20.3 file
2024-04-22 07:13:03 +02:00
Nassim Jahnke
89cd8aec1d
Merge branch 'refs/heads/dev' into preview
2024-04-21 23:47:01 +02:00
Nassim Jahnke
7ac7ea485f
Add UserConnection to component rewriters as well
2024-04-21 23:01:58 +02:00
Nassim Jahnke
5e4f25efeb
Merge branch 'refs/heads/dev' into preview
...
# Conflicts:
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
# common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
# common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
2024-04-21 22:51:45 +02:00
Nassim Jahnke
a152993ffd
Add UserConnection to item rewriters
...
Already required for ViaBackwards, later required for ViaVersion as well due to synchronized registry entries in items
2024-04-21 22:39:13 +02:00
Nassim Jahnke
73daac471c
Split up version data in dump
2024-04-21 21:55:59 +02:00
Nassim Jahnke
f4e9225f85
Store item identifiers, make identifier files more compact via global table
2024-04-21 20:47:38 +02:00
EnZaXD
1ed22327f6
Replace string->component conversion in 1.8->1.9 ( #3794 )
2024-04-21 16:00:30 +02:00
EnZaXD
ce2ad7d5eb
Change default value for new ocelot setting ( #3797 )
2024-04-21 15:15:17 +02:00
FlorianMichael
d7e66260de
Add 1.20.5 nbt->component conversion base
...
Has to be implemented into ViaBackwards yet and handlers are still missing
2024-04-21 14:53:25 +02:00
FlorianMichael
dc6d581123
Update mcstructs and use new component serializer
2024-04-21 12:13:59 +02:00
FlorianMichael
bd3f1206e6
[ci skip] document 1.9 metadata in MetaIndex
2024-04-21 11:35:10 +02:00
FlorianMichael
b9e92e5c1f
Fix zombie metadata in 1.10->1.11
2024-04-21 11:24:20 +02:00
Gero
0acaed7c7a
Use correct item type for 1.20.5 particle reading
2024-04-20 23:50:24 +02:00
FlorianMichael
3055a4277d
Use toString() method in ComponentUtil
2024-04-20 22:52:40 +02:00
Gero
bcbe69d24c
Fix ITEM_NAME component to tag conversion
2024-04-20 22:44:22 +02:00
EnZaXD
33cc21d6e6
Add setting for ocelot->cat translation in 1.13.2->1.14 ( #3796 )
2024-04-20 15:17:26 +02:00
Nassim Jahnke
949b3d712e
Fix illager metadata in 1.13->1.14
2024-04-20 13:36:00 +02:00
Nassim Jahnke
216dcb2931
Remove invalid zombified piglin data
2024-04-20 12:43:08 +02:00
Nassim Jahnke
bff1536529
Fall back to keys without namespace in registry data
2024-04-20 12:06:39 +02:00
Nassim Jahnke
b221e47eb7
Add creative mode range attributes if needed
...
Add the range argument either with or without modifiers depending on the gamemode to otherwise reset them
2024-04-19 21:35:41 +02:00
EnZaXD
fb434a79bd
Use correct deserialization method in SerializerVersion#toComponent ( #3795 )
...
MCStructs has multiple methods for parsing jsons depending on the version, we should use them correctly in our wrapper to support all possible cases of components.
2024-04-19 17:05:07 +02:00
Nassim Jahnke
1be0605f51
Eat remaining particle data in spawn particle
2024-04-19 17:02:08 +02:00
Gero
e08c263ced
Add missing dust_color_transition data remapping (changed in 24w03a)
2024-04-19 11:02:11 +02:00
Nassim Jahnke
1bb85b11e9
Merge branch 'refs/heads/dev' into preview
2024-04-19 10:11:05 +02:00
AJ Ferguson
128e191132
Fix 1.15->1.16 item attribute uuid ( #3793 )
2024-04-19 10:09:17 +02:00
Nassim Jahnke
3520f99d5a
Remove empty items from various block entities
2024-04-19 09:56:24 +02:00
RaphiMC
7825a1e460
Handle show_entity type field
2024-04-18 23:11:19 +02:00
RK_01
bfde4b953c
Fix 1.11->1.12 show_achievement rewriter ( #3792 )
2024-04-18 20:45:19 +02:00
Nassim Jahnke
57b37457d6
Add spit damage type
...
The client depends on it
2024-04-18 20:12:38 +02:00
Nassim Jahnke
f7aa1a516e
Fill wolf_food item tag
2024-04-18 18:58:29 +02:00
Nassim Jahnke
b1468ac6d0
Update particle codec format
...
Was changed in 1.20.5-pre1
2024-04-18 18:36:22 +02:00
Nassim Jahnke
27b5fdb4ff
Merge branch 'refs/heads/dev' into preview
...
# Conflicts:
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_3to1_19_1/packets/EntityPackets.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java
2024-04-18 16:17:05 +02:00
Nassim Jahnke
a99273db2e
Always call onMappingDataLoaded in TagRewriter
...
In case they are needed in the future, so that we don't also have to check whether the different methods are actually called
2024-04-18 16:12:57 +02:00
Nassim Jahnke
64f911ed4a
1.20.5-rc1
2024-04-18 15:47:44 +02:00
EnZaXD
4302dd61aa
Remove Protocol1_9To1_8#FIX_JSON usage in 1.11->1.12 ( #3791 )
2024-04-18 15:26:13 +02:00
EnZaXD
98c5d38d0c
Push book contents through component conversion in 1.8->1.9 ( #3790 )
2024-04-18 15:25:48 +02:00
FlorianMichael
033d5ae49a
Handle removed item conversion in component rewriter
2024-04-17 22:39:08 +02:00
EnZaXD
8fe0681778
Replace incoming/outgoing usages with client/server bound ( #3787 )
2024-04-16 20:59:48 +02:00
EnZaXD
ea5cf3e594
Add IdAndData util and replace conversions ( #3786 )
2024-04-16 15:55:55 +02:00
Nassim Jahnke
31ccd2ab9b
1.20.5-pre2
2024-04-15 17:14:23 +02:00
FlorianMichael
2be190d152
Some consistency cleanup
2024-04-13 22:32:56 +02:00
FlorianMichael
4e25549682
Handle legacy item hover events
...
Co-authored-by: RaphiMC <50594595+raphimc@users.noreply.github.com>
2024-04-13 21:01:34 +02:00
FlorianMichael
287678c12a
[ci skip] Add comments for conversion direction to classes
2024-04-13 20:58:38 +02:00
FlorianMichael
970986bc59
Add component rewriter for 1.20.3->1.20.5
2024-04-13 20:56:54 +02:00
RK_01
2586788bf6
Fix config read/write error when parent file is null ( #3783 )
2024-04-10 17:35:25 +02:00
EnZaXD
0c2c8400ae
Make handling of optional block metadata more explicit in <1.19.4 ( #3782 )
2024-04-10 17:34:56 +02:00
Nassim Jahnke
ba4404fad6
1.20.5-pre1
2024-04-10 17:33:10 +02:00
RK_01
6f53c069ea
Fix 1.12 -> 1.13 held enderman block translation ( #3781 )
2024-04-10 10:43:48 +02:00
Nassim Jahnke
99f29e2597
Prepare proper banner id tracking, small other fixes
2024-04-09 12:40:16 +02:00
EnZaXD
7932b79080
Explain backup tags ( #1 )
2024-04-08 16:59:33 +02:00
FlorianMichael
4b780b92ee
Fix armor trim conversion
2024-04-08 15:05:01 +02:00
Nassim Jahnke
d04aaeb926
Handle color in area effect cloud
2024-04-08 14:21:11 +02:00
FlorianMichael
9f1ee27afc
Add missing checks in item id conversions
2024-04-08 13:36:58 +02:00
Nassim Jahnke
5f685884ff
Handle entity effect particle in spawn particle
2024-04-08 13:33:59 +02:00
FlorianMichael
ba2e50cc88
Fix StructuredDataConverter#removeItemBackupTag
2024-04-08 13:31:13 +02:00
FlorianMichael
7b28683b6a
Add remaining data backup handling
2024-04-08 13:18:49 +02:00
Nassim Jahnke
510747a7cd
Replace empty items in recipes
2024-04-08 10:53:39 +02:00
Nassim Jahnke
8c5752bb4c
Update unsupported java version warning
2024-04-07 22:34:20 +02:00
Nassim Jahnke
33e2a1fc13
Send unsigned messages if possible
...
The server cannot guarantee that the last seen values are correct, so in order to avoid kicks from invalid signatures, we will just strip them if possible.
2024-04-07 22:05:14 +02:00
Nassim Jahnke
83223c1520
Also handle ack in serverbound chat message
2024-04-07 20:35:07 +02:00
FlorianMichael
935077222e
Simplify code
2024-04-07 20:08:16 +02:00
FlorianMichael
8961660846
Fix chat command handling
2024-04-07 19:43:29 +02:00
Nassim Jahnke
1fe23e4aeb
Fix trade list handling
2024-04-07 13:36:02 +02:00
Nassim Jahnke
06394c1f74
Apply network limits
2024-04-07 11:41:57 +02:00
Nassim Jahnke
68c2af2795
Replace unknown sounds with direct value in registry data
2024-04-06 23:47:27 +02:00
Nassim Jahnke
c2489c7a4c
Back up 1.20.5 data components in VB for creative clients
2024-04-06 21:26:44 +02:00
Nassim Jahnke
c743c20334
Update wolf textures again, add utility methods
2024-04-06 21:26:44 +02:00
FlorianMichael
228689f181
Remove temporary goat horn fix
2024-04-06 21:26:44 +02:00
Nassim Jahnke
67e6e1a2e3
24w14a
2024-04-06 21:26:44 +02:00
Nassim Jahnke
a2c1c52f51
24w13a
2024-04-06 21:26:44 +02:00
Nassim Jahnke
0b7fdd4c69
Update wild wolf texture field name
2024-04-06 21:26:43 +02:00
Nassim Jahnke
4849ca0745
Start working on 24w12a
2024-04-06 21:26:43 +02:00
Nassim Jahnke
60b782455d
Fix display tag setting and doubled item id rewriting
2024-04-06 21:26:43 +02:00
FlorianMichael
3fef71db2e
Added missing null checks for CONTAINER_LOOT handler
2024-04-06 21:26:43 +02:00
Nassim Jahnke
9ca02680c8
Fix enchantment level
2024-04-06 21:26:43 +02:00
FlorianMichael
5899886b42
Fixes
2024-04-06 21:26:42 +02:00
Nassim Jahnke
c2567115d8
Fix various issues
2024-04-06 21:26:42 +02:00
Nassim Jahnke
4255876c22
Fix up block state handling, add PotDecorations wrapper
2024-04-06 21:26:42 +02:00
FlorianMichael
57a589924d
More structured data handling
2024-04-06 21:26:42 +02:00
Nassim Jahnke
936dcafc11
Make HolderSet an interface
2024-04-06 21:26:42 +02:00
Nassim Jahnke
b6489b8343
Fix block predicate parsing
2024-04-06 21:26:41 +02:00
Nassim Jahnke
bf11a0a7de
Start working on 24w11a
2024-04-06 21:26:41 +02:00
Nassim Jahnke
7d41706026
Rewrite block predicates the other way around as well
2024-04-06 21:26:41 +02:00
FlorianMichael
93f081dd84
Add even more backwards rewriters
2024-04-06 21:26:41 +02:00
Nassim Jahnke
3f82b150d2
Handle CanPlaceOn and CanDestroy tags
2024-04-06 21:26:39 +02:00
Nassim Jahnke
7a96498f6d
Some sanity checks, get item id by name fast
2024-04-06 21:26:17 +02:00
FlorianMichael
817febe605
Even more work!
2024-04-06 21:26:16 +02:00
Nassim Jahnke
bb4a8b73e0
Small cleanup
2024-04-06 21:26:16 +02:00
Nassim Jahnke
8d3492ba30
Add more structured data -> nbt converters
2024-04-06 21:26:16 +02:00
Nassim Jahnke
658364b643
Add a few structured data -> nbt converters
2024-04-06 21:26:16 +02:00
Nassim Jahnke
666b204ebb
Prepare class for structured data->tag rewriting
2024-04-06 21:26:16 +02:00
Nassim Jahnke
bfab9b0c11
Banner patterns and wolves
2024-04-06 21:26:15 +02:00
Nassim Jahnke
121f107ff3
More handled structures
2024-04-06 21:26:15 +02:00
Nassim Jahnke
426bd9aa99
More handled structures
2024-04-06 21:26:13 +02:00
Nassim Jahnke
7a66bb8e1c
More handled structures
2024-04-06 21:25:39 +02:00
Nassim Jahnke
329abcac7d
More handled structures
2024-04-06 21:25:08 +02:00
Nassim Jahnke
0961de898d
Handle books, among other things
2024-04-06 21:25:05 +02:00
Nassim Jahnke
b4ee564aa2
24w10a, more item component work
2024-04-06 21:23:57 +02:00
EnZaXD
73178b504e
Inline player on-ground movement handler ( #3777 )
2024-04-06 09:29:57 +02:00
EnZaXD
d0cc531386
Cleanup MetaIndex style and field names ( #3775 )
2024-04-05 20:15:41 +02:00
EnZaXD
617ef10667
Remove MetaType1_8#NonExistent ( #3774 )
2024-04-05 19:48:59 +02:00
EnZaXD
5569caf610
Improve horse armor patch in 1.8->1.9 ( #3773 )
2024-04-05 15:46:20 +02:00
EnZaXD
868a5bd24e
Remove non existing metadata from MetaIndex ( #3772 )
2024-04-05 15:45:13 +02:00
EnZaXD
b113a82710
Catch errors in <= 1.20 custom payload reading ( #3770 )
2024-04-04 22:25:02 +02:00
EnZaXD
3ee4c8ed63
Make ViaVersion fake nbt format consistent ( #3771 )
...
Adding ItemRewriter#nbtTagName utils to prefix nbt tags with a consistent format:
<Platform>|<Protocol name>|<original nbt name>
2024-04-04 09:31:58 +02:00
EnZaXD
cd65925d6b
Add conversion methods to SerializerVersion and replace missing MCStructs usages ( #3769 )
2024-04-01 15:52:57 +02:00
Nassim Jahnke
307414eb51
Move simple mcstructs usage into utils
2024-04-01 14:13:43 +02:00
EnZaXD
51745cb2ef
Rewrite 1.12.2->1.13 ComponentRewriter ( #3765 )
2024-04-01 13:38:43 +02:00
EnZaXD
f44782d21d
Fix minor inconsistencies in protocol packages ( #3768 )
2024-04-01 12:55:50 +02:00
EnZaXD
7556f7b8fa
Move chat registry dumps into nbt files ( #3763 )
2024-03-31 15:07:46 +02:00
EnZaXD
abd58399cd
Remove entity metadata buffering in 1.8->1.9 ( #3766 )
2024-03-30 22:27:40 +01:00
EnZaXD
098f7ff3c2
Allow platforms to use the mapping system ( #3754 )
2024-03-24 11:10:20 +01:00
Nassim Jahnke
feefe6f278
Merge branch 'master' into dev
...
# Conflicts:
# bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/util/ProtocolSupportUtil.java
# bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java
# bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java
# bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java
# common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java
# velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java
# velocity/src/main/java/com/viaversion/viaversion/velocity/service/ProtocolDetectorService.java
2024-03-22 20:54:44 +01:00
Nassim Jahnke
b07cf03dc1
Check for jsonnull in component conversion
...
Closes #3745
2024-03-17 16:23:27 +01:00
Nassim Jahnke
0a921d9bdc
Use the correct entity sound rewriter method
2024-03-14 14:43:37 +01:00
EnZaXD
7b0c2fb51a
Replace printStackTrace usages with proper logging ( #3741 )
2024-03-09 13:57:41 +01:00
Nassim Jahnke
b426302e76
Merge branch 'master' into dev
...
# Conflicts:
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java
# common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
# gradle/libs.versions.toml
2024-03-09 12:59:36 +01:00
Nassim Jahnke
3442cda8ce
Update ViaNBT
2024-03-09 12:57:55 +01:00
Nassim Jahnke
55a0a70264
Merge branch 'master' into dev
2024-03-09 11:36:41 +01:00
EnZaXD
a9bfda4568
Rewrite 1.11->1.12 ChatItemRewriter ( #3740 )
2024-03-09 10:58:42 +01:00
Nassim Jahnke
93990c8baa
Merge branch 'master' into dev
...
# Conflicts:
# common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java
# common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
# gradle.properties
# gradle/libs.versions.toml
2024-03-07 13:45:10 +01:00
Nassim Jahnke
f868dfa125
Update ViaNBT
2024-03-07 13:30:33 +01:00
Nassim Jahnke
386495e168
Handle map related data and skull owners
...
Co-authored-by: Drex <nicknamedrex@gmail.com>
2024-03-06 13:26:06 +01:00
Nassim Jahnke
cad78ea68f
Trim string tags in component conversion
...
Somewhat dirty but inconsequential, as the given protocol does not use this method in item conversion and it should only ever be triggered in hover events
Closes #3650
2024-03-06 12:31:31 +01:00
Nassim Jahnke
92878a39ef
We continue to fall
2024-03-01 13:46:26 +01:00
Nassim Jahnke
aa0423c6e2
Merge branch 'master' into dev
2024-03-01 12:39:25 +01:00
Nassim Jahnke
04e572fa30
Hotfix receiving level screen not closing on Velocity
...
Closes #3630
2024-03-01 12:38:54 +01:00
Nassim Jahnke
39180e22b8
The endless pit continues to be endless
2024-03-01 12:13:43 +01:00
Nassim Jahnke
f68aed464d
Once again refactor structured data storage
...
Optionals are no more
2024-02-29 19:59:18 +01:00
Nassim Jahnke
6ffa24b50b
Add todos
2024-02-29 18:23:46 +01:00
Nassim Jahnke
e51d7b3fdb
Fix initial item sending, add some data translation and more rigid data structures
2024-02-29 17:03:50 +01:00
Nassim Jahnke
01bb8dedda
More renames
2024-02-29 12:08:29 +01:00
RK_01
4cf271af81
Use equals in legacy custom payload channel comparisons ( #3721 )
2024-02-29 11:11:00 +01:00
Nassim Jahnke
aa262bb0a5
Rename itemdata to be more generic
2024-02-28 22:46:33 +01:00
Nassim Jahnke
2480eb6a7f
Start working on 24w09a
2024-02-28 22:15:31 +01:00
Nassim Jahnke
56b82b049a
Move a few methods out of AbstractProtocol
2024-02-27 17:21:27 +01:00
EnZaXD
3c0930c62f
Use existing ProtocolVersion#getProtocol when possible ( #3720 )
2024-02-27 14:02:16 +01:00
EnZaXD
26a8e5fef1
Fix enabled version sorting in DumpUtil ( #3719 )
2024-02-27 14:01:47 +01:00
caramel
caa6519780
Fix leather armor rendering ( #3713 )
2024-02-25 20:36:48 +01:00
caramel
1e35c2713f
Fix particle doesn't use new mapping id ( #3712 )
2024-02-25 20:36:27 +01:00
caramel
cd5d88c34f
Fix wrong join game packet handling ( #3710 )
2024-02-24 20:54:38 +01:00
EnZaXD
7640342165
Don't require a base protocol for current version in BaseProtocol ( #3709 )
2024-02-23 15:13:33 +01:00
Nassim Jahnke
4e1d4a75b2
Small refactors around ProtocolPipeline and concurrent collections
...
Make concurrency handling in ProtocolPipelineImpl more defensive, as generally the pipeline is expected to never be called from multiple threads. The only case to look out for is pipeline additions during protocol transformation in a base protocol
2024-02-21 12:18:19 +01:00
EnZaXD
343b403cf1
Ensure ProtocolManagerImpl#registerBaseProtocol doesn't support VersionType#SPECIAL protocols ( #3705 )
2024-02-19 10:09:44 +01:00
RK_01
78aecbddf8
Don't add base protocols when using special versions ( #3704 )
2024-02-18 21:55:14 +01:00
Nassim Jahnke
a8fbb000eb
Add ProtocolManager#hasLoadedMappings
2024-02-15 18:27:52 +01:00
EnZaXD
ff25cbd6eb
Add RedirectProtocolVersion API to common module ( #3701 )
2024-02-15 18:21:38 +01:00
EnZaXD
c7baa27fd0
Some code cleanup ( #3698 )
2024-02-14 22:53:50 +01:00
Nassim Jahnke
35578372a1
Fix isWorkingPipe and cursed ProtocolVersion comparator
2024-02-14 22:45:34 +01:00
EnZaXD
293427c172
Only pass ProtocolVersion#toString into via dumps ( #3699 )
2024-02-14 21:49:40 +01:00
EnZaXD
35ceee1a47
Rename ProtocolVersion#v1_7_1 to v1_7_2 ( #3696 )
2024-02-14 20:14:17 +01:00
Nassim Jahnke
dccda57fc0
Consistent equalTo names
2024-02-14 19:14:41 +01:00
Nassim Jahnke
c124c1c809
Sort ProtocolVersions version list, fix base protocol registration
2024-02-14 17:57:00 +01:00
EnZaXD
302716054d
Port of internals and API to ProtocolVersion ( #3694 )
2024-02-14 17:56:28 +01:00
Nassim Jahnke
46a5bb16d7
24w07a
2024-02-14 17:32:13 +01:00
EnZaXD
e62c4a3f9e
Rename comparing methods in ProtocolVersion ( #3693 )
2024-02-14 09:54:15 +01:00
EnZaXD
d58c80cd2f
Add ProtocolVersionRange API ( #3691 )
2024-02-14 09:51:56 +01:00
Nassim Jahnke
7a6c51331b
Move config load after platform creation
2024-02-13 23:37:00 +01:00
Nassim Jahnke
564286d742
Remove version check from config
...
The platform might now always be available
2024-02-13 23:18:39 +01:00
Nassim Jahnke
dcc0642af9
Replace more raw versions with ProtocolVersion
2024-02-13 22:48:08 +01:00
Nassim Jahnke
621c02f974
Move some data out of extending MappingData classes
2024-02-13 18:41:05 +01:00
Nassim Jahnke
22bd350e35
Add proper ProtocolVersion comparison
2024-02-13 18:40:21 +01:00
Nassim Jahnke
a8dc5f0f07
Merge branch 'master' into dev
...
# Conflicts:
# common/src/main/java/com/viaversion/viaversion/data/entity/DimensionDataImpl.java
# common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
# common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java
2024-02-12 10:44:03 +01:00
Nassim Jahnke
d76edced04
Update template protocol
2024-02-12 10:40:17 +01:00
Nassim Jahnke
cfc048ba53
Small random cleanup
2024-02-11 10:46:08 +01:00
Nassim Jahnke
8a485db580
Replace tag instanceof checks/unchecked casts with helper methods
2024-02-10 23:28:36 +01:00
Nassim Jahnke
e0f32d9f2f
Merge remote-tracking branch 'origin/master' into dev
2024-02-08 22:02:25 +01:00
EnZaXD
ad62d8552c
Use correct logger for configuration warnings ( #3685 )
...
Fixes https://github.com/ViaVersion/ViaProxy/issues/179
2024-02-08 22:02:13 +01:00
Nassim Jahnke
4a8bd2cca2
24w06a
2024-02-07 18:29:19 +01:00
Nassim Jahnke
0fcb764652
24w05b
2024-02-01 17:49:58 +01:00
Nassim Jahnke
46e322b2f3
Merge branch 'master' into dev
2024-01-31 22:28:22 +01:00
Nassim Jahnke
87d444a017
Only rewrite pages in written book
2024-01-31 22:24:17 +01:00
Nassim Jahnke
e020c616c9
24w05a
2024-01-31 17:36:12 +01:00
Nassim Jahnke
da87241549
Merge branch 'master' into dev
...
# Conflicts:
# common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
2024-01-29 17:26:49 +01:00
EnZaXD
0d788b0d7a
Clean up more item type usage in ItemRewriter ( #3674 )
2024-01-29 17:21:59 +01:00
Nassim Jahnke
1c6f8426f1
Log the error by default, instead check suppression config
2024-01-29 10:32:02 +01:00
Nassim Jahnke
01f28a052c
Ignore errors in book conversion
2024-01-29 10:17:00 +01:00
Nassim Jahnke
cfc9011cee
Push books through component conversion in 1.20.2->1.20.3
...
Fixes #3579
2024-01-27 20:51:28 +01:00
Nassim Jahnke
6473b608f6
Merge branch 'master' into dev
...
# Conflicts:
# .github/workflows/gradle.yml
2024-01-27 13:49:48 +01:00
Nassim Jahnke
a5bd8abe93
Resize registry data array to actual size once collected
2024-01-27 13:49:27 +01:00
EnZaXD
f3d95b1e5e
Fix elytra not working with firework rockets in 1.14 -> 1.13.2 ( #3669 )
...
Closes https://github.com/ViaVersion/ViaFabricPlus/issues/331
2024-01-27 13:46:20 +01:00
Nassim Jahnke
c8d339ab30
Add generic types on base protocols
2024-01-27 13:45:40 +01:00
Nassim Jahnke
8000561ae9
Handle registry data with skipped ids
2024-01-26 16:05:58 +01:00
Nassim Jahnke
1dafa7d273
Cleanup config packet registration in newer protocols
2024-01-26 15:48:10 +01:00
Nassim Jahnke
37561705ed
24w04a
2024-01-24 20:23:33 +01:00
Nassim Jahnke
00176c4a0c
Merge branch 'master' into dev
2024-01-24 17:27:04 +01:00
Nassim Jahnke
7b8a33cc78
Small refactor to UpdateUtil
2024-01-20 16:34:18 +01:00
Nassim Jahnke
ceae2c2094
Rewrite transfer intention on older servers
2024-01-18 21:44:26 +01:00
Nassim Jahnke
52b9db5029
Handle new client intent
2024-01-18 21:22:44 +01:00
Nassim Jahnke
27af372f79
Block entity tags are no longer nullable
2024-01-18 20:46:25 +01:00
Nassim Jahnke
c4e50efa90
24w03b
2024-01-18 16:10:09 +01:00
Nassim Jahnke
fa1ae5b9c9
Entity sound did not change
2024-01-18 12:00:19 +01:00
Nassim Jahnke
8f6784e0e2
Respect previous buffer types in particle rewriting
2024-01-18 10:25:58 +01:00
Nassim Jahnke
5d5c98acc6
24w03a (maybe, and it's a bit ugly)
2024-01-17 22:55:16 +01:00
vadage
5b29ac0d8a
Support config loading from input stream as fallback if URL cannot be acquired ( #3647 )
2024-01-14 10:04:15 +01:00
Nassim Jahnke
0946c72bdc
Update missing filterFamily method name change
2024-01-12 16:01:30 +01:00
Nassim Jahnke
05470c5f1b
Merge branch 'master' into dev
2024-01-12 15:59:42 +01:00
Nassim Jahnke
0392992173
Fix metadata regression
...
Fixes #3645
2024-01-12 15:58:49 +01:00
Nassim Jahnke
34bd15dec7
Merge branch 'master' into dev
...
# Conflicts:
# template/src/main/java/com/viaversion/viaversion/template/protocols/rewriter/EntityPacketRewriter1_99.java
2024-01-12 10:30:24 +01:00
Nassim Jahnke
ef78fcd478
Update API license headers and scope
2024-01-12 10:21:45 +01:00
EnZaXD
9d646543b6
Change depthsuspend to mycelium in 1.13 -> 1.12.2 ( #3616 )
2024-01-12 09:59:17 +01:00
Nassim Jahnke
aecef3c3f8
Remove a few deprecated methods
2024-01-09 20:51:32 +01:00
Nassim Jahnke
5991ac5633
Update old metadata handlers, some cleanup
2024-01-09 20:43:43 +01:00
Nassim Jahnke
930454a723
Reset reader
2024-01-09 18:57:33 +01:00
Nassim Jahnke
b6ba7dcc44
Handle 1.20->1.20.2 tags
2024-01-09 17:18:32 +01:00
Nassim Jahnke
abb05ce902
Merge remote-tracking branch 'origin/master' into dev
2024-01-04 17:50:24 +01:00
Nassim Jahnke
bd2c4c8a16
Update license headers
2024-01-01 12:39:45 +01:00
Nassim Jahnke
f6c49555bf
Update ViaNBT
2023-12-31 13:38:14 +01:00
Nassim Jahnke
7b4d544e85
Catch tag to json conversion exceptions
2023-12-30 17:25:54 +01:00
Nassim Jahnke
fe0fbc7081
Merge branch 'master' into dev
...
# Conflicts:
# common/src/main/java/com/viaversion/viaversion/util/NBTConverter.java
2023-12-29 16:50:47 +01:00
Nassim Jahnke
bae3d8ec8a
Use viafied mcstructs
2023-12-29 16:50:21 +01:00
RK_01
00b8d22cf6
Fix 1.19 -> 1.18.2 ENTITY_EFFECT translation ( #3605 )
2023-12-27 22:11:34 +01:00
Nassim Jahnke
d62284e9cd
Make NBTConverter public
2023-12-27 20:20:09 +01:00
Nassim Jahnke
3904ed4fd7
Merge branch 'master' into dev
2023-12-27 19:44:46 +01:00
RK_01
28a0813676
Cleanup of mcstructs branch ( #3604 )
2023-12-27 19:37:48 +01:00
Nassim Jahnke
f2f357b2ae
Finish up things
2023-12-27 17:30:27 +01:00
Nassim Jahnke
dc2986600c
Use 1.12 serializer for json to legacy conversion
2023-12-27 11:40:45 +01:00
Nassim Jahnke
984c625776
Methods for VB
2023-12-26 23:59:48 +01:00
Nassim Jahnke
c62a8274ed
Use mcstructs for component conversion
2023-12-26 23:38:02 +01:00
RK_01
64c436c2e1
Handle invalid config data types ( #3595 )
2023-12-26 13:18:55 +01:00
Jerry Xiao
0e31664bfe
Fix hoverEvent translation from 1.20.2 to 1.20.3 in some cases ( #3591 )
2023-12-22 12:10:29 +01:00
Nassim Jahnke
794f401bd0
Add armadildo state meta type
2023-12-18 19:34:53 +01:00
Nassim Jahnke
dc732fac6f
23w51b
2023-12-18 18:52:18 +01:00
Nassim Jahnke
2f8114abb1
Finish 23w51a, maybe
2023-12-18 17:14:24 +01:00
Nassim Jahnke
90781c9d27
Start working on 23w51a
2023-12-18 15:58:49 +01:00
Myles
9b1716b662
Merge pull request #3581 from Jo0001/master
...
Use our own site for update check
2023-12-16 18:15:23 +00:00
Jo0001
dcd4502f5a
Use own update site
2023-12-16 18:02:35 +00:00
Aeltumn
5d4b104b33
Try to schedule sending on switch ( #3587 )
2023-12-16 16:20:53 +01:00
Jo0001
82e05afacf
Use GitHub for update check
2023-12-13 15:08:06 +00:00
Nassim Jahnke
5c8c589a40
Change read method type in update score packet
2023-12-13 12:06:44 +01:00
Nassim Jahnke
70645ec5ee
Add system property to print components before conversion
2023-12-11 12:47:00 +01:00
Nassim Jahnke
4aefc23bb8
Fix npe
2023-12-10 12:16:53 +01:00
Nassim Jahnke
2c9affa0e3
Move component conversion into its own class
...
Remove serialized component type in 1.20.3->1.20.2
2023-12-10 12:10:15 +01:00
Nassim Jahnke
1656ad45a0
Fix quotation marks appearing in mixed json arrays
...
Fixes #3572
2023-12-10 10:58:44 +01:00
Nassim Jahnke
ec2397472d
Fix 1.13->1.13.1 handling of particles with items
...
Fixes #3553
2023-12-10 10:11:47 +01:00
Nassim Jahnke
cf5f5ed4bb
Fix conversion of mixed json arrays
2023-12-09 15:19:05 +01:00
Nassim Jahnke
9387b86e4a
Clone tags instead of abusing double conversion
2023-12-08 21:23:57 +01:00
Nassim Jahnke
f762da2725
Include 1.20.4 in .3 version range
2023-12-07 22:22:30 +01:00
Nassim Jahnke
3b9ac89d73
Create pack uuid from hash
...
Fixes #3554
2023-12-07 11:14:04 +01:00
Nassim Jahnke
23ba848a69
Convert chat type in disguised chat packet
...
Fixes #3551
2023-12-07 10:10:07 +01:00
Nassim Jahnke
d98c458a4c
Queue plugin message in 1.20->1.20.2 again
2023-12-06 23:30:31 +01:00
Nassim Jahnke
1ad65d1bb0
Add component types in conversion
2023-12-06 10:55:12 +01:00
David Lüdtke
d44d89099b
Fix LazilyParsedNumber conversion ViaVersion/ViaVersion#3546 ( #3550 )
2023-12-06 09:50:33 +01:00
Nassim Jahnke
d5326fad95
Use correct type
2023-12-06 09:44:20 +01:00
Nassim Jahnke
7de9bc604a
Handle configuration tags packet
...
Fixes #3549
2023-12-06 09:41:49 +01:00
Nassim Jahnke
dfee03ddbf
Fix map data reading
...
Fixes #3545
2023-12-05 22:17:42 +01:00
Nassim Jahnke
0b1423d8b4
4.9.1 Release - fix resource pack status handling
2023-12-05 17:56:18 +01:00
RK_01
9b09b1f5f8
Fix #3542 ( #3543 )
2023-12-04 10:09:25 +01:00
RK_01
1f453dc0d9
Change gamemode data type in JOIN_GAME handlers ( #3541 )
2023-12-03 18:35:19 +01:00
RK_01
916c08ce7e
Handle invalid entity equipment slots properly ( #3540 )
2023-12-03 18:34:14 +01:00
RK_01
0ac29fb2c2
Return air instead of stone for unknown block ids ( #3539 )
2023-12-03 18:33:34 +01:00
Nassim Jahnke
45d08e9066
Directly send pong, plugin message, and keep alive in 1.20.2->1.20
2023-12-03 10:02:36 +01:00
Nassim Jahnke
6d82839e6d
1.20.3-pre4
2023-11-28 16:58:32 +01:00
Nassim Jahnke
4add75cda7
Fix reset score writing
2023-11-26 15:31:33 +01:00
Nassim Jahnke
42f38c3209
Drop old resource packs
2023-11-21 07:35:44 +01:00
Nassim Jahnke
151ecdcd72
Don't resend pack in 1.20->1.20.2 for 1.20.3 clients
2023-11-20 20:01:06 +01:00
Nassim Jahnke
a0f8ab7bbb
Some cleanup
2023-11-20 19:56:48 +01:00
Nassim Jahnke
1af2103f6c
And the serverbound one
2023-11-20 19:07:23 +01:00
Nassim Jahnke
8769742917
Also handle play resource pack
2023-11-20 19:04:32 +01:00
Nassim Jahnke
20f4907a23
1.20.3-pre1 (probably)
2023-11-20 17:55:28 +01:00
Nassim Jahnke
6fb27e5c17
A more probable probably
2023-11-19 16:18:56 +01:00
Nassim Jahnke
07b173bb74
23w46a (probably)
2023-11-19 16:13:04 +01:00
Nassim Jahnke
a2d287ff9f
23w45a
2023-11-09 15:35:07 +10:00
Nassim Jahnke
2881fb18e0
Include api sources in common sources jar
2023-11-06 20:04:45 +10:00
Nassim Jahnke
e356a35aa7
Improve Gradle scripts
...
Don't create runnable platform jars anymore, since all they really do is increase build time. Also fix texts and Gradle deprecations. Also also publish common with its shadowed configuration, not the plain java components.
2023-11-06 14:31:44 +10:00
Nassim Jahnke
ea818b272e
FU 8.5.13 doesn't exist yet
2023-10-31 18:56:38 +10:00
Nassim Jahnke
dccac81286
Fix Bungee pipeline clearing, some cleanup
2023-10-31 13:00:35 +10:00
Jo0001
ba882f8f98
Update ViaSetup Link
2023-10-29 15:35:22 +01:00
EnZaXD
f618cdec99
Don't mention Spigot page anymore and move setting to right place in config.yml ( #3505 )
2023-10-27 09:16:14 +10:00
Nassim Jahnke
ec2093cf5d
23w43a
2023-10-26 10:20:18 +10:00
EnZaXD
eb9bc2fdce
Remove permission requirements for root command ( #3502 )
2023-10-24 13:34:29 +10:00
EnZaXD
f35b4f1fac
Add own permission for every sub command ( #3501 )
2023-10-24 12:59:10 +10:00
EnZaXD
abe880dae6
Implement provider to allow signed commands in 1.19.x protocols ( #3493 )
2023-10-24 10:04:54 +10:00
EnZaXD
2c6e18e4fe
Match current command input for sub argument tab completions ( #3496 )
2023-10-24 10:02:08 +10:00
RK_01
78c7f03923
Fix and improved custom payload handling ( #3497 )
2023-10-24 10:01:33 +10:00
RK_01
68a32ed2f0
Fix identifier handling and validation ( #3498 )
2023-10-24 09:58:43 +10:00
EnZaXD
7cf008bb62
Delete unused config option and add missing documentation ( #3500 )
2023-10-24 09:56:29 +10:00
RK_01
a60342359b
Fix 1.19.0 chat signing causing error message ( #3494 )
2023-10-23 10:28:44 +10:00
RK_01
0e269fa493
Implement support for chat signing ( #3490 )
2023-10-22 19:33:59 +10:00
Nassim Jahnke
815e0820da
Fix 1.13->1.13.1 recipes, rename ITEM1_8_ARRAY
2023-10-21 13:22:25 +10:00
Nassim Jahnke
faedf26b5b
Clean up Particle
2023-10-21 13:00:39 +10:00
RK_01
c7c38e70c0
Make ClientChunks a StorableObject ( #3487 )
2023-10-21 12:13:24 +10:00
Nassim Jahnke
7edde72416
Reuse 1.15, 1.16 and 1.16.2 chunk types as well
2023-10-20 12:43:46 +10:00
Nassim Jahnke
84a054aac1
Give PacketValue a generic type
2023-10-20 12:31:16 +10:00
Nassim Jahnke
8ebc8c34f3
Reuse old chunk type instances, more type cleanup
2023-10-20 12:30:03 +10:00
Nassim Jahnke
50e55529d9
Rename old position type
2023-10-19 21:15:26 +10:00
Nassim Jahnke
553dd2cb45
Move missed type
2023-10-19 21:08:00 +10:00
Nassim Jahnke
a30d62a995
Move and rename chunk types
2023-10-19 21:03:00 +10:00
Nassim Jahnke
08f6b3ce36
Only remove id field if it actually is a uuid
2023-10-19 12:16:22 +10:00
Nassim Jahnke
7d1b0d83ce
Fix minecart block state id
2023-10-19 11:03:39 +10:00
Nassim Jahnke
e7d0b01eee
23w42a
2023-10-19 10:53:14 +10:00
Nassim Jahnke
fdfc528a9a
Cleanup and renames around types
2023-10-19 09:28:21 +10:00
Nassim Jahnke
dccb6f234b
Add missing switch breaks
2023-10-18 19:48:19 +10:00
Nassim Jahnke
6e7f936e83
Move methods from VB to VV ComponentRewriter
2023-10-18 13:50:08 +10:00
Nassim Jahnke
ec26bafd53
Update ComponentRewriter with nbt methods
2023-10-18 13:26:09 +10:00
Nassim Jahnke
d7d7940d0b
Move protocol templates from wiki to extra module
2023-10-16 22:30:12 +10:00
Nassim Jahnke
667278f9e6
Handle booleans in json->tag conversion
2023-10-16 15:35:16 +10:00
Nassim Jahnke
fa7096c5c1
Convert boss bar packets
2023-10-13 23:28:16 +10:00
Nassim Jahnke
26dad99265
23w41a
2023-10-12 01:32:00 +10:00
Nassim Jahnke
5850a9852d
More spring cleaning
2023-10-11 23:14:41 +10:00
Nassim Jahnke
095fe16447
Don't use not yet loaded platform logger in config
2023-10-11 13:23:40 +10:00
Nassim Jahnke
cbf8b8f401
Send last tags when re-entering config phase
2023-10-11 01:09:36 +10:00
Nassim Jahnke
d600b0cbe1
Queue join game first, then send config packets
2023-10-11 00:06:48 +10:00
