Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port Purpur onto hard forked Paper #1631

Merged
merged 312 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
312 commits
Select commit Hold shift + click to select a range
66b578d
Add 5 second tps average in /tps
BillyGalbreath Jan 6, 2025
c3d9035
port Implement elytra settings patch
granny Jan 6, 2025
1338c8f
Item entity immunities
BillyGalbreath Jan 6, 2025
e03cf02
Add ping command
BillyGalbreath Jan 6, 2025
56aa6bd
Add demo command
BillyGalbreath Jan 6, 2025
5bb49f1
Add credits command
encode42 Jan 6, 2025
dde9c95
port Configurable jockey options patch
granny Jan 6, 2025
902bbdb
port Phantoms attracted to crystals and crystals shoot phantoms patch
granny Jan 6, 2025
a4298cb
Add phantom spawning options
BillyGalbreath Jan 6, 2025
2cca1eb
Implement bed explosion options
BillyGalbreath Jan 6, 2025
14d7915
Implement respawn anchor explosion options
BillyGalbreath Jan 6, 2025
c84be28
Add allow water in end world option
BillyGalbreath Jan 6, 2025
b7601d9
Allow color codes in books
BillyGalbreath Jan 8, 2025
aa41e13
Entity lifespan
BillyGalbreath Jan 8, 2025
877752e
Add option to teleport to spawn if outside world border
BillyGalbreath Jan 8, 2025
beb40cb
Squid EAR immunity
BillyGalbreath Jan 8, 2025
68ecbd1
fix compilation issues
granny Jan 8, 2025
1577f71
add missing bypassIdleKick permission to default permissions
granny Jan 8, 2025
f39e848
port Phantoms burn in light patch
granny Jan 8, 2025
8051dd5
Configurable villager breeding
Draycia Jan 8, 2025
9bae588
Redstone deactivates spawners
Draycia Jan 8, 2025
f7e4b70
Totems work in inventory
Draycia Jan 8, 2025
a10fb30
Dispensers place anvils option
BillyGalbreath Jan 8, 2025
68fed2f
Allow anvil colors
BillyGalbreath Jan 8, 2025
4cd90b7
Add option to disable dolphin treasure searching
BillyGalbreath Jan 8, 2025
2008994
Short enderman height
BillyGalbreath Jan 8, 2025
c163828
Stop squids floating on top of water
BillyGalbreath Jan 9, 2025
5151548
Crying obsidian valid for portal frames
BillyGalbreath Jan 9, 2025
6c9c20d
Entities can use portals
BillyGalbreath Jan 9, 2025
71cd37f
Customizable wither health and healing
jpenilla Jan 9, 2025
1cde934
Allow toggling special MobSpawners per world
jpenilla Jan 9, 2025
a0eb904
Raid cooldown setting
jpenilla Jan 9, 2025
4880e24
port missing phantom crystal goals for generated api
granny Jan 10, 2025
669b775
Add option to disable zombie aggressiveness towards villagers
nitricspace Jan 10, 2025
d274f1e
Flying squids! Oh my!
BillyGalbreath Jan 10, 2025
17d832f
Infinity bow settings
BillyGalbreath Jan 10, 2025
b5bc5f1
Configurable daylight cycle
BillyGalbreath Jan 10, 2025
3b25087
Furnace uses lava from underneath
BillyGalbreath Jan 10, 2025
2f66907
Arrows should not reset despawn counter
BillyGalbreath Jan 10, 2025
44a04c6
Ability to re-add farmland mechanics from Alpha
Yive Jan 10, 2025
d4f6ee0
Add adjustable breeding cooldown to config
montlikadani Jan 10, 2025
fd69ad5
port Make entity breeding times configurable patch
granny Jan 10, 2025
30de494
port Apply display names from item forms of entities to entities and …
granny Jan 10, 2025
718636e
Set name visible when using a Name Tag on an Armor Stand
jpenilla Jan 10, 2025
7605c7a
Add config for allowing Endermen to despawn even while holding a block
jpenilla Jan 10, 2025
c33abd9
Add configurable snowball damage
BillyGalbreath Jan 10, 2025
62813ef
Changeable Mob Left Handed Chance
benkerllenevich Jan 10, 2025
f55ed4a
Add boat fall damage config
BillyGalbreath Jan 10, 2025
2b35460
Snow Golem rate of fire config
Titaniumtown Jan 10, 2025
b22e98a
EMC - Configurable disable give dropping
aikar Jan 10, 2025
f8446f1
port Option for Villager Clerics to farm Nether Wart patch
granny Jan 10, 2025
a491eb9
Toggle for Zombified Piglin death always counting as player kill when…
jpenilla Jan 10, 2025
377702a
Configurable chance for wolves to spawn rabid
encode42 Jan 10, 2025
b3aa488
Configurable default collar color
encode42 Jan 10, 2025
d74fd0f
Phantom flames on swoop
BillyGalbreath Jan 10, 2025
07ca45c
Option for chests to open even with a solid block on top
jpenilla Jan 10, 2025
b61ddff
Implement TPSBar
BillyGalbreath Jan 10, 2025
6efec86
Striders give saddle back
benkerllenevich Jan 10, 2025
b1707d1
PlayerBookTooLargeEvent
BillyGalbreath Jan 10, 2025
31faca1
Full netherite armor grants fire resistance
BillyGalbreath Jan 10, 2025
7aef583
port Add mobGriefing bypass to everything affected patch
granny Jan 10, 2025
80c44d1
Config to allow Note Block sounds when blocked
encode42 Jan 10, 2025
c804e1c
port Add EntityTeleportHinderedEvent patch
granny Jan 10, 2025
9d7581c
Farmland trampling changes
Proximyst Jan 10, 2025
f6d41e2
Movement options for armor stands
Proximyst Jan 10, 2025
218e349
Fix stuck in portals
BillyGalbreath Jan 10, 2025
ca2e233
port Toggle for water sensitive mob damage patch
granny Jan 10, 2025
833a4cd
Config to always tame in Creative
encode42 Jan 10, 2025
18cfece
End crystal explosion options
benkerllenevich Jan 10, 2025
4bfed8f
Configs for if Wither/Ender Dragon can ride vehicles
jpenilla Jan 10, 2025
c25c867
Dont run with scissors!
JustDoom Jan 10, 2025
4bc5217
One Punch Man!
Fourmisain Jan 10, 2025
d7c6011
Configurable Ender Pearl cooldown, damage, and Endermite RNG
encode42 Jan 10, 2025
1ae2705
Config to ignore nearby mobs when sleeping
encode42 Jan 10, 2025
9783e1d
Add back player spawned endermite API
encode42 Jan 10, 2025
bdbca56
Config Enderman aggressiveness towards Endermites
encode42 Jan 10, 2025
4b5be93
Add enchantment target for bows and crossbows
BillyGalbreath Jan 10, 2025
1797880
Config to ignore Dragon Head wearers and stare aggro
encode42 Jan 11, 2025
fc0c120
Tick fluids config
BillyGalbreath Jan 11, 2025
5d1dac5
Config to disable Llama caravans
encode42 Jan 11, 2025
4b00f67
Config to make Creepers explode on death
encode42 Jan 11, 2025
dd22eee
Configurable ravager griefable blocks list
BillyGalbreath Jan 12, 2025
9b94690
Sneak to bulk process composter
BillyGalbreath Jan 12, 2025
03a579e
Config for skipping night
benkerllenevich Jan 12, 2025
536b10c
Add config for villager trading
benkerllenevich Jan 12, 2025
95b6fea
Drowning Settings
benkerllenevich Jan 12, 2025
510dc13
Break individual slabs when sneaking
BillyGalbreath Jan 12, 2025
02e08b3
Config to disable hostile mob spawn on ice
encode42 Jan 12, 2025
b780962
Config to show Armor Stand arms on spawn
encode42 Jan 12, 2025
844e9c7
Option to make doors require redstone
BillyGalbreath Jan 12, 2025
ebb2269
Config to allow unsafe enchants
encode42 Jan 12, 2025
f17b66b
Configurable sponge absorption
encode42 Jan 12, 2025
ca2fa49
Projectile offset config
YouHaveTrouble Jan 12, 2025
401783b
Config for powered rail activation distance
encode42 Jan 12, 2025
4a4f64d
Piglin portal spawn modifier
BillyGalbreath Jan 12, 2025
0b55d1d
Config to change max number of bees
Euphillya Jan 12, 2025
c61bb4c
Config for wither explosion radius
benkerllenevich Jan 12, 2025
ddee1a1
Gamemode extra permissions
BillyGalbreath Jan 12, 2025
51ec0af
Configurable piston push limit
Euphillya Jan 12, 2025
14501bb
Configurable broadcast settings
Euphillya Jan 12, 2025
8f3d46b
Configurable mob blindness
encode42 Jan 12, 2025
7cd48e3
Hide hidden players from entity selector
BillyGalbreath Jan 12, 2025
d959ec3
Config for health to impact Creeper explosion radius
encode42 Jan 12, 2025
77abafa
Iron golem calm anger options
BillyGalbreath Jan 12, 2025
e580ae9
Breedable parrots
BillyGalbreath Jan 12, 2025
39c3bef
Configurable powered rail boost modifier
BomBardyGamer Jan 12, 2025
17e7c47
Add config change multiplier critical damage value
Euphillya Jan 12, 2025
6539f04
Option to disable dragon egg teleporting
BillyGalbreath Jan 12, 2025
4ef994e
Config for unverified username message
benkerllenevich Jan 12, 2025
1d3e953
Make anvil cumulative cost configurable
12emin34 Jan 12, 2025
6b7532b
Bee can work when raining or at night
Euphillya Jan 12, 2025
9cf0084
port API for any mob to burn daylight patch
granny Jan 12, 2025
aa2341e
Fix default permission system
BillyGalbreath Jan 12, 2025
2e031ae
Config MobEffect by world
Euphillya Jan 12, 2025
350ddd5
Beacon Activation Range Configurable
Euphillya Jan 12, 2025
5a76947
Make lightning rod range configurable
12emin34 Jan 12, 2025
c2bc28c
Burp delay, burp after eating food fills hunger bar completely
BillyGalbreath Jan 12, 2025
95a7767
Allow player join full server by permission
Euphillya Jan 12, 2025
1452dbf
Add portal permission bypass
BillyGalbreath Jan 12, 2025
0f2aac0
Shulker spawn from bullet options
BillyGalbreath Jan 12, 2025
7386901
Eating glow berries adds glow effect
BillyGalbreath Jan 12, 2025
5258a4b
Option to make drowned break doors
12emin34 Jan 12, 2025
6515a18
Configurable hunger starvation damage
encode42 Jan 12, 2025
6489c0d
Enhance SysoutCatcher
BillyGalbreath Jan 12, 2025
b03836a
Add uptime command
BillyGalbreath Jan 12, 2025
f08e4e7
Tool actionable options
BillyGalbreath Jan 12, 2025
a4e8b4d
fix compilation issues
granny Jan 12, 2025
73eb0eb
Store placer on Block when placed
BillyGalbreath Jan 12, 2025
6798228
Summoner API
BillyGalbreath Jan 12, 2025
fbfbe12
Clean up version command output
BillyGalbreath Jan 12, 2025
04ffa1c
Customizable sleeping actionbar messages
BillyGalbreath Jan 12, 2025
0d14e94
option to disable shulker box items from dropping contents when destr…
BillyGalbreath Jan 12, 2025
3ab50d1
Big dripleaf tilt delay
BillyGalbreath Jan 12, 2025
8d6a41c
Player ridable in water option
BillyGalbreath Jan 12, 2025
b56e69c
Config to disable Enderman teleport on projectile hit
encode42 Jan 12, 2025
324f9dc
Add compass command
BillyGalbreath Jan 12, 2025
54cbdfb
Toggle for kinetic damage
12emin34 Jan 12, 2025
93fdf8f
Add Option for disable observer clocks
Euphillya Jan 12, 2025
0ea35f1
Customizable Zombie Villager curing times
12emin34 Jan 12, 2025
e0aedba
Option for sponges to work on lava and mud
12emin34 Jan 12, 2025
9af9213
Toggle for Wither's spawn sound
12emin34 Jan 12, 2025
0490140
Cactus breaks from solid neighbors config
BillyGalbreath Jan 12, 2025
f920df6
Config to remove curse of binding with weakness
encode42 Jan 12, 2025
02c8395
Conduit behavior configuration
encode42 Jan 12, 2025
0a8c038
Cauldron fill chances
encode42 Jan 12, 2025
e25a65d
Config to allow mobs to pathfind over rails
encode42 Jan 12, 2025
cec78d2
Shulker change color with dye
BillyGalbreath Jan 12, 2025
92d200d
Extended OfflinePlayer API
YouHaveTrouble Jan 12, 2025
b85d330
Added the ability to add combustible items
Euphillya Jan 12, 2025
d0f36da
Option for if rain and thunder should stop on sleep
12emin34 Jan 12, 2025
a204e1b
Chance for azalea blocks to grow into trees naturally
BillyGalbreath Jan 12, 2025
a9fe8f3
Shift right click to use exp for mending
BillyGalbreath Jan 12, 2025
701db1b
Dolphins naturally aggressive to players chance
BillyGalbreath Jan 12, 2025
16f540e
port Cows naturally aggressive to players chance patch
granny Jan 12, 2025
ac321ab
Option for beds to explode on villager sleep
12emin34 Jan 12, 2025
82884d1
Halloween options and optimizations
Euphillya Jan 12, 2025
c644345
Config for grindstones
encode42 Jan 12, 2025
b60dc85
UPnP Port Forwarding
BillyGalbreath Jan 12, 2025
62ed1e3
Campfire option for lit when placed
granny Jan 12, 2025
b70cd31
options to extinguish fire blocks with snowballs
granny Jan 12, 2025
2f02445
Add option to disable zombie villagers cure
rafaelflromao Jan 12, 2025
7bdd524
Persistent BlockEntity Lore and DisplayName
jpenilla Jan 12, 2025
d137c51
add missing enderchest row perms to default permissions
granny Jan 12, 2025
2196c09
Signs allow color codes
BillyGalbreath Jan 12, 2025
9aec701
Kelp, cave, weeping, and twisting vines configurable max growth age
BillyGalbreath Jan 12, 2025
f612a38
port Mobs always drop experience patch
granny Jan 12, 2025
8628765
Grindstone API
BillyGalbreath Jan 12, 2025
99df299
Ability for hoe to replant crops and nether warts
BillyGalbreath Jan 12, 2025
665fbd5
Turtle eggs random tick crack chance
BillyGalbreath Jan 12, 2025
dd00604
Mob head visibility percent
BillyGalbreath Jan 12, 2025
66f5aa9
Configurable valid characters for usernames
BillyGalbreath Jan 12, 2025
24afeb3
Stop bees from dying after stinging
BillyGalbreath Jan 12, 2025
53ec2b8
Give bee counts in beehives to Purpur clients
BillyGalbreath Jan 12, 2025
60ae7ed
Configurable farmland trample height
BillyGalbreath Jan 12, 2025
fd9d015
Configurable player pickup exp delay
BillyGalbreath Jan 12, 2025
e35e8c2
Allow void trading
BillyGalbreath Jan 12, 2025
c4ea729
Configurable phantom size
BillyGalbreath Jan 12, 2025
58f4125
Max joins per second
BillyGalbreath Jan 12, 2025
0ae9462
Configurable minimum demand for trades
totorewa Jan 12, 2025
f989c6f
Shears can have looting enchantment
BillyGalbreath Jan 12, 2025
831e3d8
Lobotomize stuck villagers
BillyGalbreath Jan 12, 2025
25ed6c2
Option for villager display trade item
BillyGalbreath Jan 12, 2025
f1b04e2
MC-238526 - Fix spawner not spawning water animals correctly
BillyGalbreath Jan 12, 2025
652017f
Config for mob last hurt by player time
BillyGalbreath Jan 12, 2025
f92f0c2
Anvil repair/damage options
12emin34 Jan 12, 2025
3d65ad4
Option to disable turtle egg trampling with feather falling
12emin34 Jan 12, 2025
51c24d9
Add toggle for enchant level clamping
granny Jan 12, 2025
74b8f4d
Skip junit tests for purpur commands
BillyGalbreath Jan 12, 2025
93dca49
Implement configurable search radius for villagers to spawn iron golems
BillyGalbreath Jan 12, 2025
9836ca6
Stonecutter damage
BillyGalbreath Jan 12, 2025
cf7f814
Configurable damage settings for magma blocks
benkerllenevich Jan 12, 2025
277fca2
Add config for snow on blue ice
BillyGalbreath Jan 12, 2025
8151d8f
Skeletons eat wither roses
benkerllenevich Jan 12, 2025
70afaba
Enchantment Table Persists Lapis
benkerllenevich Jan 12, 2025
b011cb4
Option to disable kick for out of order chat
BillyGalbreath Jan 12, 2025
55ce479
Config for sculk shrieker can_summon state
encode42 Jan 12, 2025
0f5911b
Config to not let coral die
encode42 Jan 12, 2025
89ee032
Add local difficulty api
BillyGalbreath Jan 12, 2025
bce782f
Remove Timings
BillyGalbreath Jan 12, 2025
228ed65
Add toggle for RNG manipulation
encode42 Jan 12, 2025
ddaad3e
Add more logger output for invalid movement kicks
BillyGalbreath Jan 13, 2025
a66d347
Add Bee API
SageSphinx63920 Jan 13, 2025
f4c72b0
Debug Marker API
YouHaveTrouble Jan 13, 2025
90cf76e
mob spawning option to ignore creative players
granny Jan 13, 2025
2f8a714
Add skeleton bow accuracy option
BillyGalbreath Jan 13, 2025
8bdc2a5
Add death screen API
MelnCat Jan 13, 2025
c4f489c
Implement ram and rambar commands
BillyGalbreath Jan 13, 2025
5e369af
Configurable block blast resistance
MelnCat Jan 13, 2025
b2101bc
Configurable block fall damage modifiers
MelnCat Jan 13, 2025
ce43805
Language API
MelnCat Jan 13, 2025
5c50e44
Milk Keeps Beneficial Effects
RhythmicSys Jan 13, 2025
9154c31
MC-121706 - Fix mobs not looking up and down when strafing
Krakenied Jan 13, 2025
2f2eac7
Add log suppression for LibraryLoader
Krakenied Jan 13, 2025
23158ac
Add an option to fix MC-3304 (projectile looting)
MelnCat Jan 13, 2025
a0ab0f8
Add option to allow creeper to encircle target when fusing.
Peashooter101 Jan 13, 2025
b9538a8
Fire Immunity API
DaRacci Jan 13, 2025
b7ca473
Add option to teleport to spawn on nether ceiling damage
BillyGalbreath Jan 13, 2025
fec403a
Added goat ram event
SageSphinx63920 Jan 13, 2025
9dd5975
Log skipped entity's position
BillyGalbreath Jan 13, 2025
9fee0ac
End Crystal Cramming
BillyGalbreath Jan 13, 2025
ffc324f
Option to allow beacon effects when covered by tinted glass
12emin34 Jan 13, 2025
da34e68
Add attribute clamping and armor limit config
Owen1212055 Jan 13, 2025
2f215ec
Config to remove explosion radius clamp
Nico314159 Jan 13, 2025
0e32c6e
bonemealable sugarcane, cactus, and netherwart
granny Jan 13, 2025
ecf6f72
Add PreExplodeEvents
SageSphinx63920 Jan 13, 2025
c73698e
Improve output of plugins command
2008Choco Jan 13, 2025
8f16b68
GUI Improvements
BillyGalbreath Jan 13, 2025
ac49e76
Stored Bee API
EOT3000 Jan 13, 2025
799d1d2
Shears can defuse TNT
MrFishCakes Jan 13, 2025
71bca4e
Explorer Map API
BillyGalbreath Jan 13, 2025
566ee14
update javadoc for DamageCause.CONTACT about stonecutter damage
granny Jan 13, 2025
a059547
port missing Iron golem poppy calms anger goal for generated api
granny Jan 13, 2025
e6a4568
Option Ocelot Spawn Under Sea Level
BillyGalbreath Jan 13, 2025
15b079f
add an option for piglins to ignore gold-trimmed armor
granny Jan 13, 2025
12dc826
Add option for always showing item in player death messages
MelnCat Jan 13, 2025
7bf47cf
place end crystal on any block
granny Jan 13, 2025
49d9c9c
Add option to disable the copper oxidation proximity penalty
MelnCat Jan 13, 2025
78b4963
register minecraft debug commands
granny Jan 13, 2025
f614581
Configurable villager search radius
Jan 13, 2025
0acbcf8
option to make ravagers afraid of rabbits
granny Jan 13, 2025
1292a1b
config for startup commands
granny Jan 13, 2025
fd5d4ab
Config to reverse bubble column flow
granny Jan 13, 2025
e0b1e20
Adopt MaterialRerouting
granny Jan 13, 2025
5af0f76
Fire EntityTeleportHinderedEvent when attempting to teleport
Villagers654 Jan 13, 2025
dc0bf0c
fix compilation errors
granny Jan 13, 2025
e547298
fix runtime errors
granny Jan 13, 2025
0798147
make test work
granny Jan 13, 2025
ad38c53
update workflow script and configuration files
granny Jan 13, 2025
233fcce
Updated Upstream (Paper)
granny Jan 14, 2025
2f9cf51
update contributing guide
granny Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 10 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,16 @@ ij_java_names_count_to_use_import_on_demand = 999999
ij_java_imports_layout = *,|,$*
ij_java_generate_final_locals = true
ij_java_generate_final_parameters = true

[test-plugin/**/*.java]
ij_java_method_parameters_new_line_after_left_paren = true
ij_java_method_parameters_right_paren_on_new_line = true
ij_java_use_fq_class_names = false
ij_java_class_names_in_javadoc = 1

[purpur-server/src/minecraft/java/**/*.java]
ij_java_use_fq_class_names = true

[Purpur-Server/src/main/resources/data/**/*.json]
[purpur-server/src/minecraft/resources/data/**/*.json]
indent_size = 2

[paper-api-generator/generated/**/*.java]
ij_java_imports_layout = $*,|,*
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
- name: Configure Git
run: git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions"
- name: Apply Patches
run: ./gradlew applyPatches --no-daemon --stacktrace
run: ./gradlew applyAllPatches --no-daemon --stacktrace
- name: Build
run: ./gradlew build --no-daemon --stacktrace
- name: Rebuild on Failure
if: ${{ failure() }}
run: |
./gradlew clean cleanCache
./gradlew applyPatches --no-daemon --stacktrace
./gradlew clean cleanCache --refresh-dependencies
./gradlew applyAllPatches --no-daemon --stacktrace
./gradlew build --no-daemon --stacktrace
15 changes: 8 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ manifest.mf
*~

# other stuff
run/

build-data/
Purpur-API
Purpur-MojangAPI
Purpur-Server
paper-api-generator
/run

/purpur-server/build.gradle.kts
/purpur-server/src/minecraft
/paper-server
/purpur-api/build.gradle.kts
/paper-api
/paper-api-generator
*.jar
test-plugin.settings.gradle.kts
4 changes: 2 additions & 2 deletions .idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/runConfigurations/Upstream_Paper__build_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading