Skip to content

Commit 3305813

Browse files
committed
Begin work on Adventure 5
1 parent 41d2a9d commit 3305813

20 files changed

+355
-729
lines changed

api/src/main/java/net/kyori/adventure/text/AbstractComponent.java

Lines changed: 0 additions & 90 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* This file is part of adventure, licensed under the MIT License.
3+
*
4+
* Copyright (c) 2017-2022 KyoriPowered
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
*/
24+
package net.kyori.adventure.text;
25+
26+
import org.jetbrains.annotations.NotNull;
27+
import org.jetbrains.annotations.Nullable;
28+
29+
import static java.util.Objects.requireNonNull;
30+
31+
abstract class AbstractNBTComponentBuilder<C extends NBTComponent<C, B>, B extends NBTComponentBuilder<C, B>> extends AbstractComponentBuilder<C, B> implements NBTComponentBuilder<C, B> {
32+
protected @Nullable String nbtPath;
33+
protected boolean interpret = ComponentInternals.NBT_INTERPRET_DEFAULT;
34+
protected @Nullable Component separator;
35+
36+
AbstractNBTComponentBuilder() {
37+
}
38+
39+
AbstractNBTComponentBuilder(final @NotNull C component) {
40+
super(component);
41+
this.nbtPath = component.nbtPath();
42+
this.interpret = component.interpret();
43+
this.separator = component.separator();
44+
}
45+
46+
@Override
47+
@SuppressWarnings("unchecked")
48+
public @NotNull B nbtPath(final @NotNull String nbtPath) {
49+
this.nbtPath = requireNonNull(nbtPath, "nbtPath");
50+
return (B) this;
51+
}
52+
53+
@Override
54+
@SuppressWarnings("unchecked")
55+
public @NotNull B interpret(final boolean interpret) {
56+
this.interpret = interpret;
57+
return (B) this;
58+
}
59+
60+
@Override
61+
@SuppressWarnings("unchecked")
62+
public @NotNull B separator(final @Nullable ComponentLike separator) {
63+
this.separator = ComponentLike.unbox(separator);
64+
return (B) this;
65+
}
66+
}

api/src/main/java/net/kyori/adventure/text/BlockNBTComponent.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import org.jetbrains.annotations.Contract;
3232
import org.jetbrains.annotations.NotNull;
3333

34+
import static java.util.Objects.requireNonNull;
35+
3436
/**
3537
* Given an in-game position, this component reads the NBT of the associated block and displays that information.
3638
*
@@ -346,7 +348,11 @@ interface WorldPos extends Pos {
346348
@Deprecated
347349
@ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
348350
static @NotNull WorldPos of(final @NotNull Coordinate x, final @NotNull Coordinate y, final @NotNull Coordinate z) {
349-
return new BlockNBTComponentImpl.WorldPosImpl(x, y, z);
351+
return new BlockNBTComponentImpl.WorldPosImpl(
352+
requireNonNull(x, "x"),
353+
requireNonNull(y, "y"),
354+
requireNonNull(z, "z")
355+
);
350356
}
351357

352358
/**

0 commit comments

Comments
 (0)