#20240615.0 (Update to 1.21)

caramel-moe · Jun 15, 2024 · 3476f03 · 3476f03
1 parent dd2460a
commit 3476f03
Show file tree

Hide file tree

Showing 23 changed files with 88 additions and 455 deletions.
diff --git a/...hub/workflows/daydream-api-build-1.20.yml → ...hub/workflows/daydream-api-build-1.21.yml b/...hub/workflows/daydream-api-build-1.20.yml → ...hub/workflows/daydream-api-build-1.21.yml
@@ -1,4 +1,4 @@
-name: Build Daydream API (1.20)
+name: Build Daydream API (1.21)
 
 on:
   push:

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 <p>Daydream is Paper's Fork with the aim of using various API.</p>
 
 [![caramel.moe](https://img.shields.io/badge/made%20by.-caramel.moe-red)](https://caramel.moe)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/LemonCaramel/Daydream-API/daydream-api-build-1.20.yml)](https://github.com/LemonCaramel/Daydream-API/actions/workflows/daydream-api-build-1.20.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/LemonCaramel/Daydream-API/daydream-api-build-1.21.yml)](https://github.com/LemonCaramel/Daydream-API/actions/workflows/daydream-api-build-1.21.yml)
 [![Discord](https://img.shields.io/discord/534586842079821824.svg?label=use%20server&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/f9qGtYF)
 
 ENGLISH, [KOREAN](README_KO.md)
@@ -37,7 +37,7 @@ Maven
 <dependency>
     <groupId>moe.caramel</groupId>
     <artifactId>daydream-api</artifactId>
-    <version>1.20.6-R0.1-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,6 +53,6 @@ repositories {
 
 dependencies {
     // Daydream API
-    compileOnly("moe.caramel", "daydream-api", "1.20.6-R0.1-SNAPSHOT")
+    compileOnly("moe.caramel", "daydream-api", "1.21-R0.1-SNAPSHOT")
 }
 ```
diff --git a/README_KO.md b/README_KO.md
@@ -5,7 +5,7 @@
 <p>Daydream은 Paper의 Fork로 다양한 API 사용을 목표로 제작되었습니다.</p>
 
 [![caramel.moe](https://img.shields.io/badge/made%20by.-caramel.moe-red)](https://caramel.moe)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/LemonCaramel/Daydream-API/daydream-api-build-1.20.yml)](https://github.com/LemonCaramel/Daydream-API/actions/workflows/daydream-api-build-1.20.yml)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/LemonCaramel/Daydream-API/daydream-api-build-1.21.yml)](https://github.com/LemonCaramel/Daydream-API/actions/workflows/daydream-api-build-1.21.yml)
 [![Discord](https://img.shields.io/discord/534586842079821824.svg?label=use%20server&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/f9qGtYF)
 
 [ENGLISH](README.md), KOREAN
@@ -37,7 +37,7 @@ Maven
 <dependency>
     <groupId>moe.caramel</groupId>
     <artifactId>daydream-api</artifactId>
-    <version>1.20.6-R0.1-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,6 +53,6 @@ repositories {
 
 dependencies {
     // Daydream API
-    compileOnly("moe.caramel", "daydream-api", "1.20.6-R0.1-SNAPSHOT")
+    compileOnly("moe.caramel", "daydream-api", "1.21-R0.1-SNAPSHOT")
 }
 ```
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
     paperclip("io.papermc:paperclip:3.0.3")
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 group = moe.caramel
-version = 1.20.6-R0.1-SNAPSHOT
+version = 1.21-R0.1-SNAPSHOT
 
-mcVersion = 1.20.6
+mcVersion = 1.21
 
-paperCommit = 5d8e53d78d0089894c9552b95b7b8ad9dcc8cb6f
+paperCommit = 097284d06be5a2456fa3123fbbb127904134a021
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/0002-Add-Daydream-Config.patch b/patches/0002-Add-Daydream-Config.patch
@@ -84,10 +84,10 @@ index 0000000000000000000000000000000000000000..ee7141524a2b01dcba434c8b619f8b37
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 49d2547fcdaf779e284f513e58c1ac2ae3000bda..b110c7e21bd1ef650da09f839368758b2988e937 100644
+index bbc4d7d3ca84642828f9a3f788ca26bba900d15b..a24de4c81f576ea73c6cf614378fe7b0b796001a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2257,6 +2257,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2251,6 +2251,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

diff --git a/patches/0003-Add-Daydream-Command.patch b/patches/0003-Add-Daydream-Command.patch
@@ -21,10 +21,10 @@ index c7cdc2ad8a2c43e8c0fcaa1761d3b81726c5ebcb..587ea1b818dd1117509dff892ba7dbd5
      }
 
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..54c1a1323d0c4f187e56ce102cd4ed7d1e099798 100644
+index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..dd8750e40e7eaa24874bc856167960c2d068ae33 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -34,7 +34,7 @@ public class SimpleCommandMap implements CommandMap {
+@@ -35,7 +35,7 @@ public class SimpleCommandMap implements CommandMap {
          setDefaultCommands();
      }