Skip to content

Commit

Permalink
add prefixes and descriptions
Browse files Browse the repository at this point in the history
  • Loading branch information
granny committed Sep 16, 2021
1 parent 161dcf0 commit 7aa7c54
Show file tree
Hide file tree
Showing 150 changed files with 964 additions and 202 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Initial Source <[email protected]>
Date: Fri, 16 Jul 2021 17:11:36 -0500
Subject: [PATCH] Airplane Server Changes
Subject: [PATCH] |META| Airplane Server Changes

Copyright (C) 2020 Technove LLC

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Wed, 18 Aug 2021 13:53:37 -0500
Subject: [PATCH] Change Airplane defaults closer to vanilla
Subject: [PATCH] |META| Change Airplane defaults closer to vanilla


diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 25f1656a47037b0245cdd32e475b41e64dbad1de..c6dd2567ac88c7bfff0a23201752fa6561f2565b 100644
index 3cb9e223c90f97aa106ee1e9512d33897a6bac1a..7037f868f0e925a79fbf6be8f3810d9e75133fda 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -202,7 +202,7 @@ public class PaperConfig {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
Subject: [PATCH] |META| Rebrand

Changes user facing branding to Purpur

diff --git a/build.gradle.kts b/build.gradle.kts
index c1e70d5f127804deabcf626b725390863e896d38..c6b4a4d679614b13215768e0c38b9fe0e9ca76a7 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
Subject: [PATCH] |META| Purpur config files

Gets the Purpur configuration system in place

diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index f5d01bce4d5547b4aeca96b7962b2090f47ea541..05f1b6d103ec20f196b60944f5bc007384c449f1 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Fri, 30 Jul 2021 14:31:25 -0500
Subject: [PATCH] Purpur client support
Subject: [PATCH] |FEAT| Purpur client support


diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Tue, 29 Jun 2021 21:37:40 -0500
Subject: [PATCH] Component related conveniences
Subject: [PATCH] |META| Component related conveniences


diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
Expand Down Expand Up @@ -103,7 +103,7 @@ index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..1c1602f839828252748e1acacfe42c7c
this.server.sendMessage(message, sender);
Iterator iterator = this.players.iterator();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 732eb171f6a8fe1b02044a00fcf85217c41116ac..3b7d72f035d7fd74971af043294047ff1ed4c95c 100644
index 598575b540752e050a94ca703a2b135adbb2018c..033ef002588881985a22e9990adb09fa56b28106 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3596,6 +3596,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Sun, 5 Jul 2020 22:19:49 -0500
Subject: [PATCH] Ridables
Subject: [PATCH] |FEAT| Ridables


diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Thu, 10 Dec 2020 16:44:54 -0600
Subject: [PATCH] Configurable entity base attributes
Subject: [PATCH] |FEAT| Configurable entity base attributes


diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 33edd0863374b4a7f2b0812879b23533515da447..efcba8ea0ab1f25f6480fe0a3bbe1537764438aa 100644
index 530d3e8c0377593e973fad65b98f9f484e1ca3bd..3ba4408f172f22bc9a86c5fcc71e01119f85ca07 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;
Expand Down Expand Up @@ -34,7 +34,7 @@ index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a

@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 69acb18fb715c751e3c3c412dae151fb6a8239b6..a7e0126d1fed75bfa810f405a4dd5b70668bf08e 100644
index 6515850e975e8bb303fd6ac1fb4a205dd582237f..2f32bb77a31a40dc34da24dda4defe1f3b1b150f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -287,6 +287,7 @@ public abstract class LivingEntity extends Entity {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Fri, 5 Jun 2020 21:30:19 -0500
Subject: [PATCH] Timings stuff
Subject: [PATCH] |FEAT| Timings modifications

Adds server.properties and purpur.yml to the configs tab in timings.
Replaces aikar's timings link with purpur's.
Doesn't include server.properties options that start with "rcon" or
"query", or equal to "level-seed".

$-----------------------------$
settings:
timings:
url:
default: https://timings.pl3x.net
description: |-
The server where timing reports are posted to.
To use Aikar's timings server use "http://timings.aikar.co"
$-----------------------------$

diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index da6a5b1b2f5203a0fab8e4fccd727951df7c9c9a..bca3bc0b8687940dff181bab6a5a2a3c11423358 100644
index 6e8001c7ff6497c9e5c274a5fe85cc204f3ba4c5..c5803537b23d44bad5f447bd2f98d54226d3e80e 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -226,10 +226,14 @@ public class TimingsExport extends Thread {
Expand Down Expand Up @@ -46,7 +60,7 @@ index da6a5b1b2f5203a0fab8e4fccd727951df7c9c9a..bca3bc0b8687940dff181bab6a5a2a3c

JSONObject object = new JSONObject();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 3781e7c23347a5860c448a94bd01cb90979d9d4a..977363508e090ede5191f7dbc4c258bfb0a9c911 100644
index 2ac56ca31d57991aef4fd77212cd9a537753b8d7..7a580dec61eaf50d57628b30f84d246558266dd1 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -217,7 +217,7 @@ public class PaperConfig {
Expand All @@ -59,7 +73,7 @@ index 3781e7c23347a5860c448a94bd01cb90979d9d4a..977363508e090ede5191f7dbc4c258bf
TimingsManager.url += "/";
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 41134227b3902f6e008f1db7b0803a1f81e7fd6e..b634d1a67b741feadf3f8fda5439a501fef3d132 100644
index f5cdf3338411650add4a2eb41e0412182b1f6fdf..8747593597ed270400ef3d3f6b141a0fb370f1b4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -161,4 +161,17 @@ public class PurpurConfig {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Barrels and enderchests 6 rows
Subject: [PATCH] |FEAT| Barrels and enderchests have 6 rows

Adds the ability to increase barrel and enderchest inventory sizes
from 3 rows to 6 rows. Optionally also adds permission based row
sizes for enderchests for 1 - 6 rows based on permissions.

$-----------------------------$
settings:
blocks:
barrel:
six-rows:
default: false
description: |-
Barrels should have 6 rows of inventory space instead of 3
ender_chest:
six-rows:
default: false
description: |-
Ender chests should have 6 rows of inventory space instead of 3
use-permissions-for-rows:
default: false
description: |-
Use permission nodes to determine the number of rows allowed.
With this setting enabled all players have six rows by default unless otherwise specified using permissions

Requires settings.blocks.ender_chest.six-rows to be true
Requires the purpur.enderchest.rows.<number> permission
$-----------------------------$

diff --git a/src/main/java/net/minecraft/world/inventory/ChestMenu.java b/src/main/java/net/minecraft/world/inventory/ChestMenu.java
index e9d9245f7efaaeefc8f107b8016a462ce173816a..56dcc1b6ceaad998be62e3b8c125e8f5e833e4c0 100644
Expand Down Expand Up @@ -170,7 +196,7 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..aa4d3a8a51050df14d5df4a494ee6665

@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d6c27e3e0f7c3a574c00dc86bf76f8a4a9dc0213..995c77d2ea5a095d1529fc0507703d64f59028c1 100644
index 8747593597ed270400ef3d3f6b141a0fb370f1b4..eaff201b75f74a41e14c43d522d7b87faf9296b3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -174,4 +174,39 @@ public class PurpurConfig {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Fri, 31 May 2019 21:24:33 -0500
Subject: [PATCH] Advancement API
Subject: [PATCH] |FEAT| Advancement API

Exposes more advancement internals to the API for plugin use

diff --git a/src/main/java/net/minecraft/advancements/DisplayInfo.java b/src/main/java/net/minecraft/advancements/DisplayInfo.java
index dea17bc7a6e4db470afaaad3c98940297a50e4e4..fcce31f9d575cc7388d8ec4bc2e088c9f4781833 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Fri, 18 Oct 2019 22:50:12 -0500
Subject: [PATCH] Llama API
Subject: [PATCH] |FEAT| Llama API

Exposes more llama entity internals to the API for plugin use

diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
index e037d618955de9a213a9cd90752b29d189faace4..34dec0a94840a8865f1d80857ec54a1022ae5b84 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,55 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] AFK API
Subject: [PATCH] |FEAT| AFK API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes Mojang's player idle timeout feature into an AFK system and
exposes it to the API for plugin use.

$-----------------------------$
settings:
messages:
afk-broadcast-away:
default: "§e§o%s is now AFK"
description: |-
This is the message that gets broadcasted when a user goes AFK (must have
player-idle-timeout set greater than 0 & kick-if-idle set as false)
afk-broadcast-back:
default: "§e§o%s is no longer AFK"
description: |-
This is the message that gets broadcasted when a user is no longer AFK (must
have player-idle-timeout set greater than 0 & kick-if-idle set as false)
afk-tab-list-prefix:
default: "[AFK] "
description: |-
The prefix that shows up on the playerlist before someone's name when they're AFK
world-settings:
default:
gameplay-mechanics:
player:
idle-timeout:
kick-if-idle:
default: true
description: |-
Kick players if they become idle (see server.properties for player-idle-timeout time)
tick-nearby-entities:
default: true
description: |-
Should entities tick normally when nearby players are afk. False will require at
least 1 non-afk player in order to tick
count-as-sleeping:
default: false
description: |-
Should AFK players count as sleeping? (allows active players to skip night by
sleeping, even if AFK players are not in bed)
update-tab-list:
default: false
description: |-
Should AFK players have their name updated in the tab list (puts [AFK] in front of their name)
$-----------------------------$

diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825..04d2e4e641c12fb259ee7758db81b3544193a2df 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name
Subject: [PATCH] |FEAT| Bring back server name

Re-adds the `server-name` property to server.properties and exposes
it to the API for plugin use

diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
index 0544ac93513d3a274bfb53bb6120bd598f4d603b..9ce5984fbeba4839290c9d213d441957d38fe835 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Sat, 21 Mar 2020 11:47:39 -0500
Subject: [PATCH] Configurable server mod name
Subject: [PATCH] |FEAT| Configurable server mod name

Adds a config option that allows you to modify the server name

$-----------------------------$
settings:
server-mod-name:
default: Purpur
description: |-
The server name that shows up when a client is outdated or when someone opens the debug screen [F3]

$-----------------------------$

diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index aa1c40af600245e0020b85d292a673683caecba7..adb69ec9916304204930a5988569c20e8a8868f9 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] LivingEntity safeFallDistance
Subject: [PATCH] |FEAT| LivingEntity safeFallDistance

Adds the ability to change the safe fall distance for LivingEntity instances with the API

By default the vanilla safe distance value of 3.0 is used until a plugin changes it

diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2f32bb77a31a40dc34da24dda4defe1f3b1b150f..f7446fdf4c18399a3b3ac5182f1a8fc5bde08919 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Lagging threshold
Subject: [PATCH] |FEAT| Lagging threshold

Adds the config option below that lets you determine what level of TPS is considered lagging.

$-----------------------------$
settings:
lagging-threshold:
default: 19.0
description: |-
Purpur keeps track of when it is lagging in order to have the ability to change behaviors accordingly.
This value is that threshold when you want to consider the server to be lagging.
Right now this is only used for the mob.villager.brain-ticks setting
$-----------------------------$

diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index adb69ec9916304204930a5988569c20e8a8868f9..ce0b5770129d91c7fc1cfa751f9828973444e5fe 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Fri, 5 Jul 2019 16:36:55 -0500
Subject: [PATCH] ItemFactory#getMonsterEgg
Subject: [PATCH] |FEAT| ItemFactory#getMonsterEgg

Adds and exposes a convenience method to the API to easily get a spawn egg for an EntityType

diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
index b16f338a001254c700fe4e10a5cec0d6dc7bd127..6afba641943717cc9c75420d9f3af1048543a17e 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Fri, 5 Jul 2019 18:21:00 -0500
Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
Subject: [PATCH] |FEAT| PlayerSetSpawnerTypeWithEggEvent

Adds a new event to the API that triggers when a player changes a spawner's mob type using a spawner egg

diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 03371c99c34ba4b2ffde3f6da36f171b582e3c3f..d354b44ecabdd2ce245c224c6e22bfd5c2e58553 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Sat, 20 Jul 2013 22:40:56 -0400
Subject: [PATCH] EMC - MonsterEggSpawnEvent
Subject: [PATCH] |FEAT| EMC - MonsterEggSpawnEvent

Adds a new event that triggers when a mob is spawned using a spawner egg

diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index d354b44ecabdd2ce245c224c6e22bfd5c2e58553..88e556fc543c3143bffc62edf868c9dc44ab2597 100644
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <[email protected]>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
Subject: [PATCH] |FEAT| Player invulnerabilities

Exposes player invulnerability after spawning to the config.

Also adds a new setting to put a player into invulnerable mode while
accepting a resource pack so they dont take damage during the loading screen

$-----------------------------$
gameplay-mechanics:
player:
spawn-invulnerable-ticks:
default: 60
description: |-
How long in ticks a player is invulnerable when they first spawn in
invulnerable-while-accepting-resource-pack:
default: false
description: |-
Sets the player as invulnerable while they download the resource pack
$-----------------------------$

diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863da1df6127 100644
Expand Down
Loading

0 comments on commit 7aa7c54

Please sign in to comment.