Skip to content

Commit c5710ac

Browse files
github-actions[bot]github-actions[bot]
committed
Deploying to Daydream-API
1 parent 8e5f5fd commit c5710ac

File tree

8 files changed

+80
-12
lines changed

8 files changed

+80
-12
lines changed

‎daydream-api/paper-patches/features/0008-Add-Packet-API.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,10 +1033,10 @@ index 695445638c24acfa962872b53b08bd97c183b2e4..557497d6868aa53d3e5f094d62a4934c
10331033
+ // Daydream end - (feature) Add Packet API
10341034
}
10351035
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
1036-
index a836dd5eb7f9bcbf525e86e9538deed0c9f94c08..3ba6b828f8df5117159f3afd4f5d82e34c6e9960 100644
1036+
index 8a4ba35ea54fcbc38785a3d9cc64c3e36d513053..01af6d541581ce14c63a9f329d3024006963c22f 100644
10371037
--- a/src/main/java/org/bukkit/World.java
10381038
+++ b/src/main/java/org/bukkit/World.java
1039-
@@ -1665,6 +1665,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1039+
@@ -1666,6 +1666,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
10401040
public Entity getEntity(@NotNull java.util.UUID uuid);
10411041
// Paper end
10421042

@@ -1079,7 +1079,7 @@ index 45228fac38d88cab5a7fc1d0178a30d18bd2cb28..f7bb65d359aff5d5670fb751e1762f55
10791079
* Gets the amount of ticks this entity has lived for.
10801080
* <p>
10811081
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
1082-
index 840d6465989cbd8e6285ec966eaa3de8db2a1849..b2ebdceb213dc9b710656acdeb4e97777e708951 100644
1082+
index 543c3f7eef06563e9700f4706dc9488dc8d2501f..9cdfafe0ed1804634ab74e9ef2138a79e16fa4a5 100644
10831083
--- a/src/main/java/org/bukkit/entity/Player.java
10841084
+++ b/src/main/java/org/bukkit/entity/Player.java
10851085
@@ -1081,6 +1081,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

‎daydream-api/paper-patches/features/0009-Add-more-Explosion-API.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ index 0000000000000000000000000000000000000000..0f3b4d814e3d2663b03510d3f3ae0c42
141141
+ boolean wasCancelled();
142142
+}
143143
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
144-
index 3ba6b828f8df5117159f3afd4f5d82e34c6e9960..3b583fffc9fde77bf95579f1c66ee1b2be60cd16 100644
144+
index 01af6d541581ce14c63a9f329d3024006963c22f..49e0a4db856a6019ca1fdabd6d7a2a0351f0b8ec 100644
145145
--- a/src/main/java/org/bukkit/World.java
146146
+++ b/src/main/java/org/bukkit/World.java
147-
@@ -2198,6 +2198,246 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
147+
@@ -2199,6 +2199,246 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
148148
*/
149149
public int getClearWeatherDuration();
150150

@@ -504,7 +504,7 @@ index 9a8f5f6dca26b79579f0cb9621002448554b96e1..0337c8295742d88afb36fd691850d9ff
504504

505505
/**
506506
diff --git a/src/main/java/org/bukkit/tag/DamageTypeTags.java b/src/main/java/org/bukkit/tag/DamageTypeTags.java
507-
index f09f128b196cb22451ec773878485f67b35c212d..90622aa85c9fbb11c2998baee6614f074beb4fe5 100644
507+
index 32ac1e1ecbf9e6f471180c4ef99d2e13a71d4d79..ab031fd9baf59ba38fd318a203e9fcaeb3b363f6 100644
508508
--- a/src/main/java/org/bukkit/tag/DamageTypeTags.java
509509
+++ b/src/main/java/org/bukkit/tag/DamageTypeTags.java
510510
@@ -81,6 +81,13 @@ public final class DamageTypeTags {

‎daydream-api/paper-patches/features/0011-Add-client-type-predictor.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add client type predictor
55

66

77
diff --git a/src/main/java/io/papermc/paper/connection/PlayerCommonConnection.java b/src/main/java/io/papermc/paper/connection/PlayerCommonConnection.java
8-
index cae2e5ba5dd74b64bcd4f2041fa6b4e944f34c24..a68ebb77ba2cf5d2267fbe695b67dbabf62dbb9c 100644
8+
index 7cba94e4916b64c20ea34ed6626cde7f697d9cd5..c66413f84532cd3a6f020a999b5fa93c63976950 100644
99
--- a/src/main/java/io/papermc/paper/connection/PlayerCommonConnection.java
1010
+++ b/src/main/java/io/papermc/paper/connection/PlayerCommonConnection.java
11-
@@ -42,4 +42,24 @@ public interface PlayerCommonConnection extends WritablePlayerCookieConnection,
11+
@@ -43,4 +43,24 @@ public interface PlayerCommonConnection extends WritablePlayerCookieConnection,
1212
* @return the client option value of the player
1313
*/
1414
<T> T getClientOption(ClientOption<T> type);

‎daydream-api/paper-patches/files/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java
22
+++ b/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java
3-
@@ -382,6 +_,45 @@
3+
@@ -452,6 +_,45 @@
44
return provider().resourceKey(registryKey);
55
}
66

‎daydream-api/paper-patches/files/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java
22
+++ b/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java
3-
@@ -106,4 +_,11 @@
3+
@@ -122,4 +_,11 @@
44
<T> ArgumentType<TypedKey<T>> resourceKey(RegistryKey<T> registryKey);
55

66
<T> ArgumentType<T> resource(RegistryKey<T> registryKey);

‎daydream-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/World.java
22
+++ b/src/main/java/org/bukkit/World.java
3-
@@ -3507,6 +_,38 @@
3+
@@ -3518,6 +_,38 @@
44
*/
55
void playSound(@NotNull Location location, @NotNull String sound, @NotNull SoundCategory category, float volume, float pitch);
66

‎daydream-api/src/main/java/moe/caramel/daydream/brigadier/Resolvers.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,18 @@
99
import com.mojang.brigadier.exceptions.CommandSyntaxException;
1010
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
1111
import io.papermc.paper.command.brigadier.CommandSourceStack;
12+
import io.papermc.paper.command.brigadier.argument.AxisSet;
1213
import io.papermc.paper.command.brigadier.argument.SignedMessageResolver;
14+
import io.papermc.paper.command.brigadier.argument.position.ColumnBlockPosition;
15+
import io.papermc.paper.command.brigadier.argument.position.ColumnFinePosition;
16+
import io.papermc.paper.command.brigadier.argument.predicate.BlockInWorldPredicate;
1317
import io.papermc.paper.command.brigadier.argument.predicate.ItemStackPredicate;
1418
import io.papermc.paper.command.brigadier.argument.range.DoubleRangeProvider;
1519
import io.papermc.paper.command.brigadier.argument.range.IntegerRangeProvider;
20+
import io.papermc.paper.command.brigadier.argument.resolvers.AngleResolver;
1621
import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
22+
import io.papermc.paper.command.brigadier.argument.resolvers.ColumnBlockPositionResolver;
23+
import io.papermc.paper.command.brigadier.argument.resolvers.ColumnFinePositionResolver;
1724
import io.papermc.paper.command.brigadier.argument.resolvers.FinePositionResolver;
1825
import io.papermc.paper.command.brigadier.argument.resolvers.PlayerProfileListResolver;
1926
import io.papermc.paper.command.brigadier.argument.resolvers.RotationResolver;
@@ -177,6 +184,30 @@ public static BlockPosition blockPosition(final CommandContext<CommandSourceStac
177184
.resolve(context.getSource());
178185
}
179186

187+
/**
188+
* 명령어 컨텍스트와 주어진 인수 이름으로부터 2차원 정수형 위치를 해석합니다.
189+
*
190+
* @param context 명령어 컨텍스트
191+
* @param name 인수의 이름
192+
* @return 2차원 정수형 위치
193+
*/
194+
public static ColumnBlockPosition columnBlockPosition(final CommandContext<CommandSourceStack> context, final String name) throws CommandSyntaxException {
195+
return context
196+
.getArgument(name, ColumnBlockPositionResolver.class)
197+
.resolve(context.getSource());
198+
}
199+
200+
/**
201+
* 명령어 컨텍스트와 주어진 인수 이름으로부터 블록 예측을 가져옵니다.
202+
*
203+
* @param context 명령어 컨텍스트
204+
* @param name 인수의 이름
205+
* @return 블록 예측
206+
*/
207+
public static BlockInWorldPredicate blockInWorldPredicate(final CommandContext<CommandSourceStack> context, final String name) {
208+
return context.getArgument(name, BlockInWorldPredicate.class);
209+
}
210+
180211
/**
181212
* 명령어 컨텍스트와 주어진 인수 이름으로부터 실수형 위치를 해석합니다.
182213
*
@@ -190,6 +221,19 @@ public static FinePosition finePosition(final CommandContext<CommandSourceStack>
190221
.resolve(context.getSource());
191222
}
192223

224+
/**
225+
* 명령어 컨텍스트와 주어진 인수 이름으로부터 2차원 실수형 위치를 해석합니다.
226+
*
227+
* @param context 명령어 컨텍스트
228+
* @param name 인수의 이름
229+
* @return 2차원 실수형 위치
230+
*/
231+
public static ColumnFinePosition columnFinePosition(final CommandContext<CommandSourceStack> context, final String name) throws CommandSyntaxException {
232+
return context
233+
.getArgument(name, ColumnFinePositionResolver.class)
234+
.resolve(context.getSource());
235+
}
236+
193237
/**
194238
* 명령어 컨텍스트와 주어진 인수 이름으로부터 회전을 해석합니다.
195239
*
@@ -203,6 +247,30 @@ public static Rotation rotation(final CommandContext<CommandSourceStack> context
203247
.resolve(context.getSource());
204248
}
205249

250+
/**
251+
* 명령어 컨텍스트와 주어진 인수 이름으로부터 실수형 각도를 해석합니다.
252+
*
253+
* @param context 명령어 컨텍스트
254+
* @param name 인수의 이름
255+
* @return 실수형 각도
256+
*/
257+
public static float angle(final CommandContext<CommandSourceStack> context, final String name) throws CommandSyntaxException {
258+
return context
259+
.getArgument(name, AngleResolver.class)
260+
.resolve(context.getSource());
261+
}
262+
263+
/**
264+
* 명령어 컨텍스트와 주어진 인수 이름으로부터 축 세트를 해석합니다.
265+
*
266+
* @param context 명령어 컨텍스트
267+
* @param name 인수의 이름
268+
* @return 축 세트
269+
*/
270+
public static AxisSet axes(final CommandContext<CommandSourceStack> context, final String name) throws CommandSyntaxException {
271+
return context.getArgument(name, AxisSet.class);
272+
}
273+
206274
/**
207275
* 명령어 컨텍스트와 주어진 인수 이름으로부터 블록 상태를 해석합니다.
208276
*

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version = 1.21.8-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.8
55

6-
paperCommit = ed31825a8d9d4016a1fcd4c10b24926b51ced4cc
6+
paperCommit = 614e9acfca696b98b810c65e3582993fcefc321e
77

88
org.gradle.configuration-cache = true
99
org.gradle.caching = true

0 commit comments

Comments
 (0)