Skip to content

Commit 662db63

Browse files
committed
refactor: Merge vanilla default files with normal config files
1 parent 39f554b commit 662db63

File tree

10 files changed

+84
-138
lines changed

10 files changed

+84
-138
lines changed

config-specs/paper/paper-global.yml

+19-1
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,13 @@ collisions:
132132
however, in the majority of cases, this is a worthy tradeoff
133133
commands:
134134
suggest-player-names-when-null-tab-completions:
135+
vanilla: "false"
135136
default: "true"
136137
description: >-
137138
Instructs the server to return a list of players when tab-completing when
138139
there are no other completions available
139140
time-command-affects-all-worlds:
141+
vanilla: "true"
140142
default: "false"
141143
description: >-
142144
Whether the /time command should act on all worlds or just the sender's
@@ -155,9 +157,11 @@ console:
155157
description: Whether the console command sender has all permissions
156158
item-validation:
157159
display-name:
160+
vanilla: "2147483647"
158161
default: "8192"
159162
description: The maximum length of an item's display name in characters
160163
lore-line:
164+
vanilla: "2147483647"
161165
default: "8192"
162166
description: The maximum length of a lore line in characters
163167
resolve-selectors-in-books:
@@ -167,16 +171,20 @@ item-validation:
167171
creative mode will be able to crash the server in yet another way
168172
book:
169173
author:
174+
vanilla: "2147483647"
170175
default: "8192"
171176
description: The maximum length of a book's author in characters
172177
page:
178+
vanilla: "2147483647"
173179
default: "16384"
174180
description: The maximum length of a book's page in characters
175181
title:
182+
vanilla: "2147483647"
176183
default: "8192"
177184
description: The maximum length of a book's title in characters
178185
book-size:
179186
page-max:
187+
vanilla: disabled
180188
default: "2560"
181189
description: >-
182190
The max number of bytes a single page in a book can contribute to the
@@ -235,6 +243,7 @@ messages:
235243
Formatted using [MiniMessage](https://docs.advntr.dev/minimessage/).
236244
misc:
237245
fix-entity-position-desync:
246+
vanilla: "false"
238247
default: "true"
239248
description: >-
240249
Causes the server to lose the same precision that the client does for
@@ -246,6 +255,7 @@ misc:
246255
Loads bukkit's permission.yml file before plugins, allowing them to check
247256
information set there immediately on enable
248257
max-joins-per-tick:
258+
vanilla: "2147483647"
249259
default: "5"
250260
description: >-
251261
Sets the maximum amount of players that may join the server in a single
@@ -303,9 +313,11 @@ packet-limiter:
303313
DROP which will ignore packets over the limit, and KICK which will kick
304314
players for exceeding the limit
305315
interval:
316+
vanilla: "0.000001"
306317
default: "7.0"
307-
description: "The interval, in seconds, for which max-packet-rate should apply"
318+
description: The interval, in seconds, for which max-packet-rate should apply
308319
max-packet-rate:
320+
vanilla: "999999.0"
309321
default: "500.0"
310322
description: The number of packets allowed per player within the interval
311323
kick-message:
@@ -376,6 +388,7 @@ scoreboards:
376388
will incur a performance degradation
377389
spam-limiter:
378390
incoming-packet-threshold:
391+
vanilla: "2147483647"
379392
default: "300"
380393
description: >-
381394
Sets the threshold at which the server will consider incoming packets spam
@@ -447,16 +460,19 @@ unsupported-settings:
447460
The following settings are provided by Paper but are not officially
448461
supported. Use them at your own risk and they may be removed at any time.
449462
allow-headless-pistons:
463+
vanilla: "true"
450464
default: "false"
451465
description: >-
452466
Whether the server should allow the creation of headless pistons. These
453467
are often used to break permanent blocks
454468
allow-permanent-block-break-exploits:
469+
vanilla: "true"
455470
default: "false"
456471
description: >-
457472
Whether unbreakable blocks can be broken with Vanilla exploits. This
458473
includes bedrock, end portal frames, end portal blocks, and more
459474
allow-piston-duplication:
475+
vanilla: "true"
460476
default: "false"
461477
description: >-
462478
Whether to allow duplication of TNT, carpets, and rails. This does not
@@ -469,6 +485,7 @@ unsupported-settings:
469485
standing bug in Paper. Enabling this option means that the damage tick will be
470486
skipped, which may result in rapid damage on shields due to the missing invulnerability.
471487
perform-username-validation:
488+
vanilla: "false"
472489
default: "true"
473490
description: >-
474491
Whether the server should validate usernames. While this may allow users
@@ -481,6 +498,7 @@ unsupported-settings:
481498
supports ZLIB, GZIP and NONE, where None namely allows for compression to
482499
be disabled
483500
allow-unsafe-end-portal-teleportation:
501+
vanilla: "true"
484502
default: "false"
485503
description: >-
486504
This setting allows for exploits related to end portal teleportation to be

config-specs/paper/paper-world-defaults.yml

+17
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ chunks:
8484
ticks-per.autosave in bukkit.yml for this world. By default it will use
8585
the global ticks-per.autosave in bukkit.yml
8686
delay-chunk-unloads-by:
87+
vanilla: 0s
8788
default: 10s
8889
description: >-
8990
Delays chunk unloads by the specified time. Formatted as a duration with a
@@ -108,6 +109,7 @@ chunks:
108109
The timer is increased when chunks are kept loaded because of player
109110
activity
110111
max-auto-save-chunks-per-tick:
112+
vanilla: "200"
111113
default: "24"
112114
description: >-
113115
The maximum number of chunks the auto-save system will save in a single
@@ -124,6 +126,7 @@ chunks:
124126
This may have a performance impact
125127
collisions:
126128
allow-player-cramming-damage:
129+
vanilla: "true"
127130
default: "false"
128131
description: >-
129132
Allows players to take damage from cramming when colliding with more
@@ -141,6 +144,7 @@ collisions:
141144
also be counted towards the entity cramming limit so that they can take
142145
suffocation damage
143146
max-entity-collisions:
147+
vanilla: "2147483647"
144148
default: "8"
145149
description: >-
146150
Instructs the server to stop processing collisions after this value is
@@ -227,6 +231,7 @@ entities:
227231
default: "false"
228232
description: "Removes AI from pigmen spawned via nether portals "
229233
only-merge-items-horizontally:
234+
vanilla: "true"
230235
default: "false"
231236
description: >-
232237
Prevents merging items that are not on the same y level, preventing potential
@@ -237,9 +242,11 @@ entities:
237242
Makes parrots "sticky" so they do not fall off a player's shoulder when
238243
they move. Use crouch to shake them off
239244
phantoms-do-not-spawn-on-creative-players:
245+
vanilla: "false"
240246
default: "true"
241247
description: "Disables spawning of phantoms on players in creative mode "
242248
phantoms-only-attack-insomniacs:
249+
vanilla: "false"
243250
default: "true"
244251
description: "Prevents phantoms from attacking players who have slept "
245252
piglins-guard-chests:
@@ -336,6 +343,7 @@ entities:
336343
H**; the item id will appear at the bottom of the tooltip that
337344
appears when you hover over an item
338345
count-all-mobs-for-spawning:
346+
vanilla: "true"
339347
default: "false"
340348
description: >-
341349
Determines whether spawner mobs and other misc mobs are counted towards
@@ -405,6 +413,7 @@ entities:
405413
spawn egg
406414
duplicate-uuid:
407415
mode:
416+
vanilla: "NOTHING"
408417
default: SAFE_REGEN
409418
description: >-
410419
Specifies the method the server uses to resolve entities with
@@ -424,13 +433,15 @@ entities:
424433
If multiple entities with duplicate UUIDs are within this many blocks,
425434
saferegen will delete all but 1 of them
426435
filter-bad-tile-entity-nbt-from-falling-blocks:
436+
vanilla: "false"
427437
default: "true"
428438
description: >-
429439
Instructs the server to remove certain NBT data from falling blocks.
430440
**Note**: Some adventure maps may require this to be turned off to
431441
function correctly, but we do not recommend turning it off on a public
432442
server
433443
filtered-entity-tag-nbt-paths:
444+
vanilla: "[]"
434445
default: "[Pos, Motion, SleepingX, SleepingY, SleepingZ]"
435446
description: >-
436447
A list of NBT tags that will be removed from the EntityTag tag on items
@@ -460,6 +471,7 @@ entities:
460471
despawned. The default value instructs the server to use the same
461472
default arrow despawn rate from spigot.yml that is used for all arrows
462473
per-player-mob-spawns:
474+
vanilla: "false"
463475
default: "true"
464476
description: >-
465477
Determines whether the mob limit (in bukkit.yml) is counted per player
@@ -787,6 +799,7 @@ fixes:
787799
value of disabled will disable this feature
788800
hopper:
789801
cooldown-when-full:
802+
vanilla: "false"
790803
default: "true"
791804
description: >-
792805
Instructs the server to apply a short cooldown when the hopper is full,
@@ -852,6 +865,7 @@ lootables:
852865
to new locations by breaking them via the likes of pistons.
853866
maps:
854867
item-frame-cursor-limit:
868+
vanilla: "2147483647"
855869
default: "128"
856870
description: >-
857871
The number of cursors (markers) allowed per map. A large number of cursors
@@ -968,6 +982,7 @@ scoreboards:
968982
never on a team. Disabling this may slightly decrease the amount of time
969983
the server spends calculating entity collisions
970984
use-vanilla-world-scoreboard-name-coloring:
985+
vanilla: "true"
971986
default: "false"
972987
description: >-
973988
Instructs the server to use the Vanilla scoreboard for player nickname
@@ -1017,11 +1032,13 @@ tick-rates:
10171032
for the names. Might change between updates!
10181033
unsupported-settings:
10191034
disable-world-ticking-when-empty:
1035+
vanilla: "true"
10201036
default: "false"
10211037
description: >-
10221038
Stops the ticking of the world when there are no players or force loaded chunks present in
10231039
the world.
10241040
fix-invulnerable-end-crystal-exploit:
1041+
vanilla: "false"
10251042
default: "true"
10261043
description: >-
10271044
If set to false, the creation of invulnerable end crystals will be

config-specs/paper/server-properties.yml

+1
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ op-permission-level:
145145
default: "4"
146146
description: "Sets the default permission level for ops when using /op. (Allowed values: 0, 1, 2, 3, 4)"
147147
pause-when-empty-seconds:
148+
vanilla: "60"
148149
default: "-1"
149150
description: >
150151
How many seconds have to pass after no player has been online before the server is paused.

config-specs/paper/spigot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -262,21 +262,26 @@ world-settings:
262262
to 0 for global (including cross-dimension).
263263
entity-activation-range:
264264
animals:
265+
vanilla: "0"
265266
default: "32"
266267
description: The entity activation range for animals.
267268
flying-monsters:
269+
vanilla: "0"
268270
default: "32"
269271
description: The entity activation range for flying monsters.
270272
ignore-spectators:
271273
default: "false"
272274
description: Whether spectators activate entities within range.
273275
misc:
276+
vanilla: "0"
274277
default: "16"
275278
description: The entity activation range for misc entities.
276279
monsters:
280+
vanilla: "0"
277281
default: "32"
278282
description: The entity activation range for monsters.
279283
raiders:
284+
vanilla: "0"
280285
default: "64"
281286
description: The entity activation range for raiders.
282287
tick-inactive-villagers:
@@ -358,6 +363,7 @@ world-settings:
358363
A limit of how many inactive villagers can be woken up on the same
359364
tick.
360365
water:
366+
vanilla: "0"
361367
default: "16"
362368
description: The entity activation range for water mobs.
363369
entity-tracking-range:
@@ -624,6 +630,7 @@ world-settings:
624630
default: "50"
625631
description: "This option does not operate, as it is disabled by a Paper patch."
626632
max-tnt-per-tick:
633+
vanilla: "-1"
627634
default: "100"
628635
description: How many TNT to process per server tick. Set to 0 to disable.
629636
merge-radius:

config-specs/paper/vanilla/paper-global.yml

-55
This file was deleted.

0 commit comments

Comments
 (0)