From 7381e14ddc6cd20ef684b6735e41bfc1cbb3b901 Mon Sep 17 00:00:00 2001 From: Bovvol Date: Thu, 11 Aug 2022 10:20:38 +0900 Subject: [PATCH 1/8] [CI-SKIP] readme update --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b5aaad5..572d095 100644 --- a/README.md +++ b/README.md @@ -35,15 +35,15 @@ A Server Platform for Minecraft: Java Edition with many improvements based on [P Join [Discord](https://discord.gg/CQGVqeXQQC) and let us know error and help us find how to solve it! -### 유용한 서버 +### useful servers - [Minecraft Development Dictionary (MDD)](https://discord.gg/AZwXTA9Pgx) - - Minecraft에 관련된 다양한 뉴스, 소식과 서버 개발에 대한 정보를 얻고 질문&답변 할 수 있습니다. + - You can get infos about Minecraft's news, announcement and server develop. - [Minecraft Customization Community (MCC)](https://discord.gg/nnkecH6n24) - - Minecraft의 모드, 리소스팩, 셰이더에 대한 정보를 얻고 질문&답변 할 수 있습니다. + - You can get infos about Minecraft's mods, resource pack, shader. -### 파트너 서버 -- [혜아의 팬디코](https://discord.gg/ByHmmDSr4m) +### partner server +- [Hyeah's fan discord](https://discord.gg/ByHmmDSr4m) ## [#saveminecraft](https://saveminecraft.org/) [#saveminecraft](https://saveminecraft.org/) is movement that refuses chatting report which added by Mojang Studios and Microsoft in Minecraft: Java Edition's 1.19.1(A.K.A. 1.**19.84**). #saveminecraft movement's goal is adding new permission for server admin without make minecraft's multiplay in danger, or removing chatting report. #saveminecraft movement protest peacefully and share this recognition widely. **You can view detail by clicking [here](src/SAVEMINECRAFT/ENG.md).** From 2845e427b28b5e6fed44b6cd65534355a0f2228e Mon Sep 17 00:00:00 2001 From: Alpha Date: Thu, 11 Aug 2022 10:31:09 +0900 Subject: [PATCH 2/8] [CI-Skip] --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 572d095..c710ff5 100644 --- a/README.md +++ b/README.md @@ -35,15 +35,15 @@ A Server Platform for Minecraft: Java Edition with many improvements based on [P Join [Discord](https://discord.gg/CQGVqeXQQC) and let us know error and help us find how to solve it! -### useful servers -- [Minecraft Development Dictionary (MDD)](https://discord.gg/AZwXTA9Pgx) +### Useful servers +- [Minecraft Development Dictionary (MDD)](https://discord.gg/AZwXTA9Pgx) (KOREAN) - You can get infos about Minecraft's news, announcement and server develop. -- [Minecraft Customization Community (MCC)](https://discord.gg/nnkecH6n24) +- [Minecraft Customization Community (MCC)](https://discord.gg/nnkecH6n24) (KOREAN) - You can get infos about Minecraft's mods, resource pack, shader. -### partner server -- [Hyeah's fan discord](https://discord.gg/ByHmmDSr4m) +### Partnerships +- [Hyeah's fan discord](https://discord.gg/ByHmmDSr4m) (KOREAN) ## [#saveminecraft](https://saveminecraft.org/) [#saveminecraft](https://saveminecraft.org/) is movement that refuses chatting report which added by Mojang Studios and Microsoft in Minecraft: Java Edition's 1.19.1(A.K.A. 1.**19.84**). #saveminecraft movement's goal is adding new permission for server admin without make minecraft's multiplay in danger, or removing chatting report. #saveminecraft movement protest peacefully and share this recognition widely. **You can view detail by clicking [here](src/SAVEMINECRAFT/ENG.md).** From 6ac50dcfb8329f7fd0fce09c55cf5e8f0f688302 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 11 Aug 2022 08:58:53 +0000 Subject: [PATCH 3/8] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@7e11afa Fix mad cursor addition via API (#8276) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 341f4b5..2614fdb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = net.prismarineteam.prismarine version = 1.19.2-R0.1-SNAPSHOT -paperCommit = 2a74071bcb9d633f3cddccd974b1e926e37ed326 +paperCommit = 7e11afa4262f4c34721fa516bc1765903651512f org.gradle.caching = true org.gradle.parallel = true From 46d984187c1989ab8707e2c929a339b53cf23d1a Mon Sep 17 00:00:00 2001 From: Alpha Date: Thu, 11 Aug 2022 21:07:21 +0900 Subject: [PATCH 4/8] [CI-Skip] Remove unneeded server --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index c710ff5..30d05b6 100644 --- a/README.md +++ b/README.md @@ -42,9 +42,6 @@ Join [Discord](https://discord.gg/CQGVqeXQQC) and let us know error and help us - [Minecraft Customization Community (MCC)](https://discord.gg/nnkecH6n24) (KOREAN) - You can get infos about Minecraft's mods, resource pack, shader. -### Partnerships -- [Hyeah's fan discord](https://discord.gg/ByHmmDSr4m) (KOREAN) - ## [#saveminecraft](https://saveminecraft.org/) [#saveminecraft](https://saveminecraft.org/) is movement that refuses chatting report which added by Mojang Studios and Microsoft in Minecraft: Java Edition's 1.19.1(A.K.A. 1.**19.84**). #saveminecraft movement's goal is adding new permission for server admin without make minecraft's multiplay in danger, or removing chatting report. #saveminecraft movement protest peacefully and share this recognition widely. **You can view detail by clicking [here](src/SAVEMINECRAFT/ENG.md).** From 0cb5ee555985a651384a5f812a81fade2f3b76ae Mon Sep 17 00:00:00 2001 From: Alpha Date: Thu, 11 Aug 2022 21:07:53 +0900 Subject: [PATCH 5/8] [CI-Skip] . --- src/README/KOR.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/README/KOR.md b/src/README/KOR.md index 0363848..e55c6ce 100644 --- a/src/README/KOR.md +++ b/src/README/KOR.md @@ -44,9 +44,6 @@ Prismarine - [Minecraft Customization Community (MCC)](https://discord.gg/nnkecH6n24) - Minecraft의 모드, 리소스팩, 셰이더에 대한 정보를 얻고 질문&답변 할 수 있습니다. -### 파트너 서버 -- [혜아의 팬디코](https://discord.gg/ByHmmDSr4m) - ## [#saveminecraft](https://saveminecraft.org/) [#saveminecraft](https://saveminecraft.org/)는 Minecraft: Java Edition의 1.19.1(1.**19.84**라고도 불림)에 Mojang Studios와 Microsoft에 의해 추가된 채팅 신고 기능에 반대하는 운동입니다. saveminecraft 운동의 목표는 Minecraft의 멀티 플레이를 위험에 빠뜨리지 않고 서버의 관리자에게 권한을 부여하는 새로운 채팅 신고 기능을 추가하거나, 채팅 신고 기능을 완전히 제거하는 것입니다. saveminecraft 운동은 이 변화를 평화적으로 항의하고 인식을 확산하고자 합니다. **자세한 내용은 [여기를](../SAVEMINECRAFT/KOR.md) 확인해주시기 바랍니다.** From 7b57f0caf7de53b38b9f5100bf050b9aa42902e0 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 11 Aug 2022 14:03:54 +0000 Subject: [PATCH 6/8] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3f0415b Use thread safe Random inside of ServerLoginPacketListenerImpl --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2614fdb..026dd2d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = net.prismarineteam.prismarine version = 1.19.2-R0.1-SNAPSHOT -paperCommit = 7e11afa4262f4c34721fa516bc1765903651512f +paperCommit = 3f0415b45303568fe5d362dc3fa27b3a4ca680eb org.gradle.caching = true org.gradle.parallel = true From a18d5af9f3627e967aa09cd17d093d42414f7ba2 Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Fri, 12 Aug 2022 09:51:05 -0700 Subject: [PATCH 7/8] [CI-Skip] Updated Upstream (Purpur) --- upstream-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upstream-data b/upstream-data index 3d77c33..9456e6a 100644 --- a/upstream-data +++ b/upstream-data @@ -1,2 +1,2 @@ -purpur = c8a5344a14f65362814f46c45b57379685b7fe88 +purpur = 0fd6a5698f14e8bfb6574e76cb0da54e5fb55e76 pufferfish = 4882a952ea5fcb12cf6f8f164a8010fc2f85a25c From 3f4c9635bda7979420556851cc24dd893bbfd81a Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Sun, 14 Aug 2022 14:52:30 +0900 Subject: [PATCH 8/8] Updated Upstream (Pufferfish) --- patches/api/0001-Pufferfish-API-Changes.patch | 2 +- patches/api/0002-Purpur-API-Changes.patch | 2 +- .../0001-Pufferfish-Server-Changes.patch | 6 ++-- .../server/0002-Purpur-Server-Changes.patch | 31 +++++++++---------- patches/server/0005-Rebrand.patch | 4 +-- upstream-data | 2 +- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 0b4aabf..f4db66b 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 9 Aug 2022 11:33:00 +0900 +Date: Sun, 14 Aug 2022 14:30:25 +0900 Subject: [PATCH] Pufferfish API Changes Original by Kevin Raneri diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index 466a5a1..02faaca 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 9 Aug 2022 11:53:47 +0900 +Date: Sun, 14 Aug 2022 14:39:55 +0900 Subject: [PATCH] Purpur API Changes Original by PurpurMC Team diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 6fc2c89..039af04 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 9 Aug 2022 11:32:23 +0900 +Date: Sun, 14 Aug 2022 14:29:52 +0900 Subject: [PATCH] Pufferfish Server Changes Original by Kevin Raneri @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/build.gradle.kts b/build.gradle.kts -index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..74c91f79576e85618fefb79be8d313ba871701c7 100644 +index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..7074295d7399d03e259598bb4bfa0f21434d74be 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,12 @@ plugins { @@ -32,7 +32,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..74c91f79576e85618fefb79be8d313ba - implementation(project(":paper-mojangapi")) + implementation(project(":pufferfish-api")) // Pufferfish // Paper + // Pufferfish start -+ implementation("io.papermc.paper:paper-mojangapi:1.19-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } + // Pufferfish end diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index 7389890..4a02352 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 9 Aug 2022 11:53:27 +0900 +Date: Sun, 14 Aug 2022 14:40:15 +0900 Subject: [PATCH] Purpur Server Changes Original by PurpurMC Team @@ -27,21 +27,18 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/build.gradle.kts b/build.gradle.kts -index 74c91f79576e85618fefb79be8d313ba871701c7..a9acec9feef3c5322ce2c312cd8800bcdaca0947 100644 +index 7074295d7399d03e259598bb4bfa0f21434d74be..dc00d06f9bd4cc7403e0fe89822ed40ed2e148c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -9,9 +9,9 @@ plugins { +@@ -9,7 +9,7 @@ plugins { } dependencies { - implementation(project(":pufferfish-api")) // Pufferfish // Paper + implementation(project(":purpur-api")) // Purpur // Pufferfish start -- implementation("io.papermc.paper:paper-mojangapi:1.19-R0.1-SNAPSHOT") { -+ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { // Purpur + implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { exclude("io.papermc.paper", "paper-api") - } - // Pufferfish end @@ -44,6 +44,9 @@ dependencies { runtimeOnly("mysql:mysql-connector-java:8.0.29") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper @@ -3288,7 +3285,7 @@ index d18b82f1f66cd10250a12222dfb983ef57629738..e3aa852788ff16e2b52b00a09783721a try { byte[] data = new byte[packet.data.readableBytes()]; diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index bf488013e45b9ab97568e587f4dad899498b2f73..8de50381d8b52dd87331a43fa95e09038e32db6f 100644 +index 88a849a21d6e39fd70f6e7b554528da1a5a7dd57..9e7f500e0338b70223d879df5fda47acd8843fd8 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -263,6 +263,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se @@ -8970,7 +8967,7 @@ index 45c3cec839a7c23903dedf6e3e004305da2adceb..22a66e59687ca889965536464b628f45 return super.mobInteract(player, hand); } diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java -index 2d87b740e84435ef9bd3eee3d3e2af9f707a0826..e16a9ebc84e5494ce599c6817cfd0d233326b4db 100644 +index 2d87b740e84435ef9bd3eee3d3e2af9f707a0826..0f69e1c4e4b14186e7cb99f170ac4d164d2e252c 100644 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java @@ -101,10 +101,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier { @@ -8984,7 +8981,7 @@ index 2d87b740e84435ef9bd3eee3d3e2af9f707a0826..e16a9ebc84e5494ce599c6817cfd0d23 - this.moveControl = new FlyingMoveControl(this, 20, true); + // Purpur start + this.purpurController = new org.purpurmc.purpur.controller.FlyingMoveControllerWASD(this, 0.1F, 0.5F); -+ this.moveControl = new FlyingMoveControl(this, 20, true) { ++ this.moveControl = new FlyingMoveControl(this, 20, true) { + @Override + public void tick() { + if (mob.getRider() != null && mob.isControllable()) { @@ -8998,9 +8995,9 @@ index 2d87b740e84435ef9bd3eee3d3e2af9f707a0826..e16a9ebc84e5494ce599c6817cfd0d23 this.setCanPickUpLoot(this.canPickUpLoot()); EntityPositionSource entitypositionsource = new EntityPositionSource(this, this.getEyeHeight()); -@@ -113,6 +126,28 @@ public class Allay extends PathfinderMob implements InventoryCarrier { - this.dynamicJukeboxListener = new DynamicGameEventListener<>(new Allay.JukeboxListener(entitypositionsource, GameEvent.JUKEBOX_PLAY.getNotificationRadius())); +@@ -119,6 +132,28 @@ public class Allay extends PathfinderMob implements InventoryCarrier { } + // CraftBukkit end + // Purpur start + @Override @@ -9024,9 +9021,9 @@ index 2d87b740e84435ef9bd3eee3d3e2af9f707a0826..e16a9ebc84e5494ce599c6817cfd0d23 + } + // Purpur end + - // CraftBukkit start - public void setCanDuplicate(boolean canDuplicate) { - this.entityData.set(Allay.DATA_CAN_DUPLICATE, canDuplicate); + @Override + protected Brain.Provider brainProvider() { + return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES); @@ -230,12 +265,12 @@ public class Allay extends PathfinderMob implements InventoryCarrier { @Override @@ -11161,7 +11158,7 @@ index e0f71dc12cfc28710cacfbc372026f556dcab165..fe26858b6d2f616fa34f4073ddfc1302 } // Paper end diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java -index 30a67a1eef9238e12e54c57a0608387cc0f763ef..17fbd93aa9bc397e4166d27618c6b89404e5b1ba 100644 +index 30a67a1eef9238e12e54c57a0608387cc0f763ef..3c841029197eeca960f033acf7d450145e72e0bd 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java @@ -29,6 +29,7 @@ import net.minecraft.world.entity.ai.goal.MoveToBlockGoal; @@ -11194,7 +11191,7 @@ index 30a67a1eef9238e12e54c57a0608387cc0f763ef..17fbd93aa9bc397e4166d27618c6b894 + + @Override + public void initAttributes() { -+ this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.zombieMaxHealth); ++ this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.drownedMaxHealth); + } + + @Override diff --git a/patches/server/0005-Rebrand.patch b/patches/server/0005-Rebrand.patch index 933e1fb..7b5cc81 100644 --- a/patches/server/0005-Rebrand.patch +++ b/patches/server/0005-Rebrand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index a9acec9feef3c5322ce2c312cd8800bcdaca0947..2930d67e9fe5a88261291e1ee8c523a75f500694 100644 +index dc00d06f9bd4cc7403e0fe89822ed40ed2e148c8..1dfd550e30ba1bd0b642a62bb0991395f52ec9f5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { @@ -15,7 +15,7 @@ index a9acec9feef3c5322ce2c312cd8800bcdaca0947..2930d67e9fe5a88261291e1ee8c523a7 - implementation(project(":purpur-api")) // Purpur + implementation(project(":Prismarine-API")) // Paper // Pufferfish // Purpur // Prismarine // Pufferfish start - implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { // Purpur + implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { exclude("io.papermc.paper", "paper-api") @@ -87,7 +87,7 @@ tasks.jar { attributes( diff --git a/upstream-data b/upstream-data index 9456e6a..a988038 100644 --- a/upstream-data +++ b/upstream-data @@ -1,2 +1,2 @@ purpur = 0fd6a5698f14e8bfb6574e76cb0da54e5fb55e76 -pufferfish = 4882a952ea5fcb12cf6f8f164a8010fc2f85a25c +pufferfish = 254c00275d81d8b94956f1729c8bbdc8319244f3