Skip to content

Commit bbbc952

Browse files
committed
refactor: Merge vanilla default files with normal config files
1 parent 379a114 commit bbbc952

File tree

10 files changed

+87
-146
lines changed

10 files changed

+87
-146
lines changed

Diff for: config-specs/paper/paper-global.yml

+20-1
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,20 @@ collisions:
8888
however, in the majority of cases, this is a worthy tradeoff
8989
commands:
9090
fix-target-selector-tag-completion:
91+
vanilla: "false"
9192
default: "true"
9293
description: >-
9394
Workaround for a client bug preventing entity type tag suggestions from
9495
functioning in target selectors. Resolves
9596
[MC-235045](https://bugs.mojang.com/browse/MC-235045)
9697
suggest-player-names-when-null-tab-completions:
98+
vanilla: "false"
9799
default: "true"
98100
description: >-
99101
Instructs the server to return a list of players when tab-completing when
100102
there are no other completions available
101103
time-command-affects-all-worlds:
104+
vanilla: "true"
102105
default: "false"
103106
description: >-
104107
Whether the /time command should act on all worlds or just the sender's
@@ -117,9 +120,11 @@ console:
117120
description: Whether the console command sender has all permissions
118121
item-validation:
119122
display-name:
123+
vanilla: "2147483647"
120124
default: "8192"
121125
description: The maximum length of an item's display name in characters
122126
lore-line:
127+
vanilla: "2147483647"
123128
default: "8192"
124129
description: The maximum length of a lore line in characters
125130
resolve-selectors-in-books:
@@ -129,16 +134,20 @@ item-validation:
129134
creative mode will be able to crash the server in yet another way
130135
book:
131136
author:
137+
vanilla: "2147483647"
132138
default: "8192"
133139
description: The maximum length of a book's author in characters
134140
page:
141+
vanilla: "2147483647"
135142
default: "16384"
136143
description: The maximum length of a book's page in characters
137144
title:
145+
vanilla: "2147483647"
138146
default: "8192"
139147
description: The maximum length of a book's title in characters
140148
book-size:
141149
page-max:
150+
vanilla: disabled
142151
default: "2560"
143152
description: >-
144153
The max number of bytes a single page in a book can contribute to the
@@ -197,6 +206,7 @@ messages:
197206
Formatted using [MiniMessage](https://docs.advntr.dev/minimessage/).
198207
misc:
199208
fix-entity-position-desync:
209+
vanilla: "false"
200210
default: "true"
201211
description: >-
202212
Causes the server to lose the same precision that the client does for
@@ -208,6 +218,7 @@ misc:
208218
Loads bukkit's permission.yml file before plugins, allowing them to check
209219
information set there immediately on enable
210220
max-joins-per-tick:
221+
vanilla: "2147483647"
211222
default: "5"
212223
description: >-
213224
Sets the maximum amount of players that may join the server in a single
@@ -265,9 +276,11 @@ packet-limiter:
265276
DROP which will ignore packets over the limit, and KICK which will kick
266277
players for exceeding the limit
267278
interval:
279+
vanilla: "0.000001"
268280
default: "7.0"
269-
description: "The interval, in seconds, for which max-packet-rate should apply"
281+
description: The interval, in seconds, for which max-packet-rate should apply
270282
max-packet-rate:
283+
vanilla: "999999.0"
271284
default: "500.0"
272285
description: The number of packets allowed per player within the interval
273286
kick-message:
@@ -338,6 +351,7 @@ scoreboards:
338351
will incur a performance degradation
339352
spam-limiter:
340353
incoming-packet-threshold:
354+
vanilla: "2147483647"
341355
default: "300"
342356
description: >-
343357
Sets the threshold at which the server will consider incoming packets spam
@@ -409,16 +423,19 @@ unsupported-settings:
409423
The following settings are provided by Paper but are not officially
410424
supported. Use them at your own risk and they may be removed at any time.
411425
allow-headless-pistons:
426+
vanilla: "true"
412427
default: "false"
413428
description: >-
414429
Whether the server should allow the creation of headless pistons. These
415430
are often used to break permanent blocks
416431
allow-permanent-block-break-exploits:
432+
vanilla: "true"
417433
default: "false"
418434
description: >-
419435
Whether unbreakable blocks can be broken with Vanilla exploits. This
420436
includes bedrock, end portal frames, end portal blocks, and more
421437
allow-piston-duplication:
438+
vanilla: "true"
422439
default: "false"
423440
description: >-
424441
Whether to allow duplication of TNT, carpets, and rails. This does not
@@ -431,6 +448,7 @@ unsupported-settings:
431448
standing bug in Paper. Enabling this option means that the damage tick will be
432449
skipped, which may result in rapid damage on shields due to the missing invulnerability.
433450
perform-username-validation:
451+
vanilla: "false"
434452
default: "true"
435453
description: >-
436454
Whether the server should validate usernames. While this may allow users
@@ -443,6 +461,7 @@ unsupported-settings:
443461
supports ZLIB, GZIP and NONE, where None namely allows for compression to
444462
be disabled
445463
allow-unsafe-end-portal-teleportation:
464+
vanilla: "true"
446465
default: "false"
447466
description: >-
448467
This setting allows for exploits related to end portal teleportation to be

Diff for: config-specs/paper/paper-world-defaults.yml

+17
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ chunks:
108108
ticks-per.autosave in bukkit.yml for this world. By default it will use
109109
the global ticks-per.autosave in bukkit.yml
110110
delay-chunk-unloads-by:
111+
vanilla: 0s
111112
default: 10s
112113
description: >-
113114
Delays chunk unloads by the specified time. Formatted as a duration with a
@@ -132,6 +133,7 @@ chunks:
132133
The timer is increased when chunks are kept loaded because of player
133134
activity
134135
max-auto-save-chunks-per-tick:
136+
vanilla: "200"
135137
default: "24"
136138
description: >-
137139
The maximum number of chunks the auto-save system will save in a single
@@ -148,6 +150,7 @@ chunks:
148150
This may have a performance impact
149151
collisions:
150152
allow-player-cramming-damage:
153+
vanilla: "true"
151154
default: "false"
152155
description: >-
153156
Allows players to take damage from cramming when colliding with more
@@ -165,6 +168,7 @@ collisions:
165168
also be counted towards the entity cramming limit so that they can take
166169
suffocation damage
167170
max-entity-collisions:
171+
vanilla: "2147483647"
168172
default: "8"
169173
description: >-
170174
Instructs the server to stop processing collisions after this value is
@@ -251,6 +255,7 @@ entities:
251255
default: "false"
252256
description: "Removes AI from pigmen spawned via nether portals "
253257
only-merge-items-horizontally:
258+
vanilla: "true"
254259
default: "false"
255260
description: >-
256261
Prevents merging items that are not on the same y level, preventing potential
@@ -261,9 +266,11 @@ entities:
261266
Makes parrots "sticky" so they do not fall off a player's shoulder when
262267
they move. Use crouch to shake them off
263268
phantoms-do-not-spawn-on-creative-players:
269+
vanilla: "false"
264270
default: "true"
265271
description: "Disables spawning of phantoms on players in creative mode "
266272
phantoms-only-attack-insomniacs:
273+
vanilla: "false"
267274
default: "true"
268275
description: "Prevents phantoms from attacking players who have slept "
269276
piglins-guard-chests:
@@ -360,6 +367,7 @@ entities:
360367
H**; the item id will appear at the bottom of the tooltip that
361368
appears when you hover over an item
362369
count-all-mobs-for-spawning:
370+
vanilla: "true"
363371
default: "false"
364372
description: >-
365373
Determines whether spawner mobs and other misc mobs are counted towards
@@ -429,6 +437,7 @@ entities:
429437
spawn egg
430438
duplicate-uuid:
431439
mode:
440+
vanilla: "NOTHING"
432441
default: SAFE_REGEN
433442
description: >-
434443
Specifies the method the server uses to resolve entities with
@@ -448,13 +457,15 @@ entities:
448457
If multiple entities with duplicate UUIDs are within this many blocks,
449458
saferegen will delete all but 1 of them
450459
filter-bad-tile-entity-nbt-from-falling-blocks:
460+
vanilla: "false"
451461
default: "true"
452462
description: >-
453463
Instructs the server to remove certain NBT data from falling blocks.
454464
**Note**: Some adventure maps may require this to be turned off to
455465
function correctly, but we do not recommend turning it off on a public
456466
server
457467
filtered-entity-tag-nbt-paths:
468+
vanilla: "[]" # I don't know if we want this as it is kinda ugly in the actual page. I can change it to "[] " (will not be parsed as array) if it looks better.
458469
default: "[Pos, Motion, SleepingX, SleepingY, SleepingZ]"
459470
description: >-
460471
A list of NBT tags that will be removed from the EntityTag tag on items
@@ -484,6 +495,7 @@ entities:
484495
despawned. The default value instructs the server to use the same
485496
default arrow despawn rate from spigot.yml that is used for all arrows
486497
per-player-mob-spawns:
498+
vanilla: "false"
487499
default: "true"
488500
description: >-
489501
Determines whether the mob limit (in bukkit.yml) is counted per player
@@ -818,6 +830,7 @@ fixes:
818830
value of disabled will disable this feature
819831
hopper:
820832
cooldown-when-full:
833+
vanilla: "false"
821834
default: "true"
822835
description: >-
823836
Instructs the server to apply a short cooldown when the hopper is full,
@@ -883,6 +896,7 @@ lootables:
883896
to new locations by breaking them via the likes of pistons.
884897
maps:
885898
item-frame-cursor-limit:
899+
vanilla: "2147483647"
886900
default: "128"
887901
description: >-
888902
The number of cursors (markers) allowed per map. A large number of cursors
@@ -999,6 +1013,7 @@ scoreboards:
9991013
never on a team. Disabling this may slightly decrease the amount of time
10001014
the server spends calculating entity collisions
10011015
use-vanilla-world-scoreboard-name-coloring:
1016+
vanilla: "true"
10021017
default: "false"
10031018
description: >-
10041019
Instructs the server to use the Vanilla scoreboard for player nickname
@@ -1048,11 +1063,13 @@ tick-rates:
10481063
for the names. Might change between updates!
10491064
unsupported-settings:
10501065
disable-world-ticking-when-empty:
1066+
vanilla: "true"
10511067
default: "false"
10521068
description: >-
10531069
Stops the ticking of the world when there are no players or force loaded chunks present in
10541070
the world.
10551071
fix-invulnerable-end-crystal-exploit:
1072+
vanilla: "false"
10561073
default: "true"
10571074
description: >-
10581075
If set to false, the creation of invulnerable end crystals will be

Diff for: 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.

Diff for: config-specs/paper/spigot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,12 @@ settings:
132132
description: Overrides the maximum for the maxAbsorption attribute.
133133
maxHealth:
134134
max:
135+
vanilla: "1024.0"
135136
default: "2048.0"
136137
description: Overrides the maximum for the maxHealth attribute.
137138
movementSpeed:
138139
max:
140+
vanilla: "1024.0"
139141
default: "2048.0"
140142
description: Overrides the maximum for the movementSpeed attribute.
141143
bungeecord:
@@ -262,21 +264,26 @@ world-settings:
262264
to 0 for global (including cross-dimension).
263265
entity-activation-range:
264266
animals:
267+
vanilla: "0"
265268
default: "32"
266269
description: The entity activation range for animals.
267270
flying-monsters:
271+
vanilla: "0"
268272
default: "32"
269273
description: The entity activation range for flying monsters.
270274
ignore-spectators:
271275
default: "false"
272276
description: Whether spectators activate entities within range.
273277
misc:
278+
vanilla: "0"
274279
default: "16"
275280
description: The entity activation range for misc entities.
276281
monsters:
282+
vanilla: "0"
277283
default: "32"
278284
description: The entity activation range for monsters.
279285
raiders:
286+
vanilla: "0"
280287
default: "64"
281288
description: The entity activation range for raiders.
282289
tick-inactive-villagers:
@@ -358,6 +365,7 @@ world-settings:
358365
A limit of how many inactive villagers can be woken up on the same
359366
tick.
360367
water:
368+
vanilla: "0"
361369
default: "16"
362370
description: The entity activation range for water mobs.
363371
entity-tracking-range:
@@ -624,6 +632,7 @@ world-settings:
624632
default: "50"
625633
description: "This option does not operate, as it is disabled by a Paper patch."
626634
max-tnt-per-tick:
635+
vanilla: "-1"
627636
default: "100"
628637
description: How many TNT to process per server tick. Set to 0 to disable.
629638
merge-radius:

Diff for: config-specs/paper/vanilla/paper-global.yml

-55
This file was deleted.

0 commit comments

Comments
 (0)