Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GH-286: Feature request : Edit and color sign Purpur features 

Closes #286
This commit is contained in:
Ivan Pekov 2020-11-26 12:38:40 +02:00
parent 8fee475387
commit 23b9e93f39
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
8 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PATCHES.md
View File

@ -19,6 +19,7 @@ This is an overview over all patches that are currently used.
| server | Add NBT API as a first-class lib | tr7zw | |
| api | Add StructureLocateEvent | dfsek | |
| server | Add StructureLocateEvent | dfsek | |
| server | Add component util | William Blake Galbreath | |
| api | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add no-tick block list | William Blake Galbreath | |
@ -74,6 +75,7 @@ This is an overview over all patches that are currently used.
| server | Item stuck sleep config | tr7zw | |
| api | Kill AnnotationTest | tr7zw | |
| server | Lagging threshold | William Blake Galbreath | |
| server | MC-147659 - Fix non black cats spawning in swamp huts | William Blake Galbreath | |
| server | MC-168772 Fix - Add turtle egg block options | William Blake Galbreath | |
| server | MC-4 Fix - Item position desync | William Blake Galbreath | |
| api | Modify POM | YatopiaMC | |
@ -107,6 +109,8 @@ This is an overview over all patches that are currently used.
| server | Respect PlayerKickEvent leaveMessage | Ivan Pekov | |
| server | Send more packets immediately | MrIvanPlays | |
| server | Shutdown Bootstrap thread pool | foss-mc | |
| server | Signs allow color codes | William Blake Galbreath | |
| server | Signs editable on right click | William Blake Galbreath | |
| server | Skip events if there's no listeners | William Blake Galbreath | |
| server | Smarter statistics ticking | Mykyta Komarnytskyy | |
| server | Snowman drop and put back pumpkin | William Blake Galbreath | |

2
patches/Purpur/server.txt
View File

@ -1 +1 @@
Purpur-config-files&Timings-stuff&Barrels-and-enderchests-6-rows&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&MC-168772-Fix-Add-turtle-egg-block-options&MC-4-Fix-Item-position-desync&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&Cows-eat-mushrooms&Snowman-drop-and-put-back-pumpkin&Allow-soil-to-moisten-from-water-directly-under-it&Option-to-toggle-milk-curing-bad-omen&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Allow-leashing-villagers&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps&Entity-lifespan&Squid-EAR-immunity&Allow-anvil-colors&Add-no-tick-block-list&Add-option-to-disable-dolphin-treasure-searching&Stop-squids-floating-on-top-of-water&Despawn-rate-config-options-per-projectile-type&PaperPR-Add-hex-color-code-support-for-console-loggi&Persistent-TileEntity-Lore-and-DisplayName&Infinity-bow-settings&Allow-infinite-and-mending-enchantments-together
Purpur-config-files&Timings-stuff&Add-component-util&Barrels-and-enderchests-6-rows&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&MC-168772-Fix-Add-turtle-egg-block-options&MC-4-Fix-Item-position-desync&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&MC-147659-Fix-non-black-cats-spawning-in-swamp-huts&Cows-eat-mushrooms&Snowman-drop-and-put-back-pumpkin&Signs-editable-on-right-click&Signs-allow-color-codes&Allow-soil-to-moisten-from-water-directly-under-it&Option-to-toggle-milk-curing-bad-omen&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Allow-leashing-villagers&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps&Entity-lifespan&Squid-EAR-immunity&Allow-anvil-colors&Add-no-tick-block-list&Add-option-to-disable-dolphin-treasure-searching&Stop-squids-floating-on-top-of-water&Despawn-rate-config-options-per-projectile-type&PaperPR-Add-hex-color-code-support-for-console-loggi&Persistent-TileEntity-Lore-and-DisplayName&Infinity-bow-settings&Allow-infinite-and-mending-enchantments-together

11
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -538,7 +538,7 @@ index 59a692200527a94c1f67d7058579a08803089509..00000000000000000000000000000000
- private static void entitySettings() {
- endermanShortHeight = getBoolean("settings.entity.enderman.short-height", endermanShortHeight);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 361f7857e461578e90cb71e15027dadaf794cb69..142120d9fe4b6a621957b8e7b21dd757a8eb38a2 100644
index 361f7857e461578e90cb71e15027dadaf794cb69..0432d0320aca70750759935c0f2bd2ef737a596f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,7 +1,14 @@
@ -556,7 +556,7 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..142120d9fe4b6a621957b8e7b21dd757
import static net.pl3x.purpur.PurpurConfig.log;
public class PurpurWorldConfig {
@@ -56,4 +63,123 @@ public class PurpurWorldConfig {
@@ -56,4 +63,130 @@ public class PurpurWorldConfig {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}
@ -678,6 +678,13 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..142120d9fe4b6a621957b8e7b21dd757
+ infinityWorksWithNormalArrows = getBoolean("gameplay-mechanics.infinity-bow.normal-arrows", infinityWorksWithNormalArrows);
+ infinityWorksWithSpectralArrows = getBoolean("gameplay-mechanics.infinity-bow.spectral-arrows", infinityWorksWithSpectralArrows);
+ infinityWorksWithTippedArrows = getBoolean("gameplay-mechanics.infinity-bow.tipped-arrows", infinityWorksWithTippedArrows);
+ }
+
+ public boolean signAllowColors = false;
+ public boolean signRightClickEdit = false;
+ private void signSettings() {
+ signAllowColors = getBoolean("blocks.sign.allow-colors", signAllowColors);
+ signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java.rej b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java.rej

2
patches/server/0040-Respect-PlayerKickEvent-leaveMessage.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Respect PlayerKickEvent leaveMessage
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a69d8911f84956fb879e5a08ed542254ce7ebcde..016f0ea1505434f2f5eeb41792801cd714b219de 100644
index a7373681b8442b302a5f9cf5a7408443defc6f8c..9ca2bb896a17312614b08d5717a7713908a45845 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -320,7 +320,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0052-Configurable-flight-checks.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flight checks
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 016f0ea1505434f2f5eeb41792801cd714b219de..dea37be8fc68c215fe4a44e182ee97797e838fe5 100644
index 9ca2bb896a17312614b08d5717a7713908a45845..9ee1490dd40592004c40f65bace476762801dafa 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -177,7 +177,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

2
patches/server/0064-Configurable-criterion-triggers.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Configurable criterion triggers
This patch adds toggles for three criterion triggers that are called every tick. These can be very unnecessary, and especially in the case of CriterionTriggerEnterBlock, quite heavy.
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 976c44c8eeecc513fa11de55b80317550f621407..911a98f6722628e79d37dec46321c3b3aedc5b4d 100644
index 42451ff5b9b345cd549fcbb496fc7bc053935580..151c1eb0be3099a0512caadeedc1354bb07db5c7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -431,6 +431,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

7
patches/server/0066-Infinity-No-Arrows.patch
View File

@ -18,10 +18,10 @@ index 21074d369b9f7c7f101ba85a9d350627b98217d2..e35087458dea5ac1736ec2d230d8c23b
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 142120d9fe4b6a621957b8e7b21dd757a8eb38a2..aed464125373eaefe61c14706b3bef046b2b691e 100644
index 0432d0320aca70750759935c0f2bd2ef737a596f..fb6a5f3b60819c33a3fed43f2e80558fc5d54d5e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -177,9 +177,11 @@ public class PurpurWorldConfig {
@@ -177,10 +177,12 @@ public class PurpurWorldConfig {
public boolean infinityWorksWithNormalArrows = true;
public boolean infinityWorksWithSpectralArrows = false;
public boolean infinityWorksWithTippedArrows = false;
@ -32,4 +32,5 @@ index 142120d9fe4b6a621957b8e7b21dd757a8eb38a2..aed464125373eaefe61c14706b3bef04
infinityWorksWithTippedArrows = getBoolean("gameplay-mechanics.infinity-bow.tipped-arrows", infinityWorksWithTippedArrows);
+ infinityWorksWithNoArrows = getBoolean("gameplay-mechanics.infinity-bow.no-arrows", infinityWorksWithNoArrows);
}
}
public boolean signAllowColors = false;

2
patches/server/0068-Configurable-movement-checks.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable movement checks
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index dea37be8fc68c215fe4a44e182ee97797e838fe5..3a525ce57a8e82ae593676b5993b9942a53f692f 100644
index 9ee1490dd40592004c40f65bace476762801dafa..43256c5eacae604860e906b727f922a3d74aa7e0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -440,7 +440,7 @@ public class PlayerConnection implements PacketListenerPlayIn {