Skip to content

Commit b4b4e95

Browse files
TheMeinerLPTheMeinerLP
committed
Update to Key from adventure instead of NamespaceID and remove double wrappers
1 parent a580084 commit b4b4e95

File tree

81 files changed

+548
-624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+548
-624
lines changed

‎src/main/java/net/minestom/server/FeatureFlagImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.minestom.server;
22

3+
import net.kyori.adventure.key.Key;
34
import net.minestom.server.registry.Registry;
4-
import net.minestom.server.utils.NamespaceID;
55
import org.jetbrains.annotations.NotNull;
66

77
record FeatureFlagImpl(@NotNull Registry.FeatureFlagEntry registry) implements FeatureFlag {
@@ -22,7 +22,7 @@ static FeatureFlag getId(int id) {
2222
}
2323

2424
@Override
25-
public @NotNull NamespaceID namespace() {
25+
public @NotNull Key namespace() {
2626
return registry.namespace();
2727
}
2828

‎src/main/java/net/minestom/server/adventure/AdventurePacketConvertor.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import net.minestom.server.network.packet.server.ServerPacket;
1515
import net.minestom.server.network.packet.server.play.*;
1616
import net.minestom.server.sound.SoundEvent;
17-
import net.minestom.server.utils.NamespaceID;
1817
import net.minestom.server.utils.TickUtils;
1918
import org.jetbrains.annotations.NotNull;
2019

@@ -113,7 +112,7 @@ public static int getNamedTextColorValue(@NotNull NamedTextColor color) {
113112
* @return the sound packet
114113
*/
115114
public static @NotNull ServerPacket createSoundPacket(@NotNull Sound sound, double x, double y, double z) {
116-
final NamespaceID soundName = NamespaceID.from(sound.name().asString());
115+
final Key soundName = sound.name();
117116
SoundEvent minestomSound = SoundEvent.fromNamespaceId(soundName);
118117
if (minestomSound == null) minestomSound = SoundEvent.of(soundName, null);
119118

@@ -135,7 +134,7 @@ public static int getNamedTextColorValue(@NotNull NamedTextColor color) {
135134
if (!(emitter instanceof Entity entity))
136135
throw new IllegalArgumentException("you can only call this method with entities");
137136

138-
final NamespaceID soundName = NamespaceID.from(sound.name().asString());
137+
final Key soundName = sound.name();
139138
SoundEvent minestomSound = SoundEvent.fromNamespaceId(soundName);
140139
if (minestomSound == null) minestomSound = SoundEvent.of(soundName, null);
141140

‎src/main/java/net/minestom/server/command/builder/arguments/Argument.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.minestom.server.command.builder.arguments;
22

3+
import net.kyori.adventure.key.Key;
34
import net.minestom.server.command.CommandSender;
45
import net.minestom.server.command.builder.ArgumentCallback;
56
import net.minestom.server.command.builder.Command;
@@ -9,7 +10,6 @@
910
import net.minestom.server.command.builder.suggestion.SuggestionCallback;
1011
import net.minestom.server.registry.Registry;
1112
import net.minestom.server.registry.StaticProtocolObject;
12-
import net.minestom.server.utils.NamespaceID;
1313
import org.jetbrains.annotations.ApiStatus;
1414
import org.jetbrains.annotations.NotNull;
1515
import org.jetbrains.annotations.Nullable;
@@ -33,10 +33,10 @@ public abstract class Argument<T> {
3333
public static final Registry.Container<ArgumentImpl> CONTAINER = Registry.createStaticContainer(Registry.Resource.COMMAND_ARGUMENTS, Argument::createImpl);
3434

3535
private static ArgumentImpl createImpl(String namespace, Registry.Properties properties) {
36-
return new ArgumentImpl(NamespaceID.from(namespace), properties.getInt("id"));
36+
return new ArgumentImpl(Key.key(namespace), properties.getInt("id"));
3737
}
3838

39-
record ArgumentImpl(NamespaceID namespace, int id) implements StaticProtocolObject {
39+
record ArgumentImpl(Key namespace, int id) implements StaticProtocolObject {
4040
@Override
4141
public String toString() {
4242
return name();

‎src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentItemStack.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.minestom.server.command.builder.arguments.minecraft;
22

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.nbt.BinaryTag;
45
import net.kyori.adventure.nbt.CompoundBinaryTag;
56
import net.kyori.adventure.nbt.TagStringIOExt;
@@ -13,7 +14,6 @@
1314
import net.minestom.server.item.ItemStack;
1415
import net.minestom.server.item.Material;
1516
import net.minestom.server.item.component.CustomData;
16-
import net.minestom.server.utils.NamespaceID;
1717
import net.minestom.server.utils.nbt.BinaryTagSerializer;
1818
import org.jetbrains.annotations.NotNull;
1919

@@ -68,7 +68,7 @@ public static ItemStack staticParse(@NotNull String input) throws ArgumentSyntax
6868
if (reader.peek() == '[') {
6969
reader.consume('[');
7070
do {
71-
final NamespaceID componentId = reader.readNamespaceId();
71+
final Key componentId = reader.readNamespaceId();
7272
final DataComponent<?> component = ItemComponent.fromNamespaceId(componentId);
7373
if (component == null)
7474
throw new ArgumentSyntaxException("Unknown item component", input, INVALID_COMPONENT);
@@ -138,13 +138,13 @@ public void consume(char c) {
138138
index++;
139139
}
140140

141-
public @NotNull NamespaceID readNamespaceId() {
141+
public @NotNull Key readNamespaceId() {
142142
char c;
143143
int start = index;
144144
while (hasMore() && (c = peek()) != '{' && c != '[' && c != '=') {
145145
index++;
146146
}
147-
return NamespaceID.from(input.substring(start, index));
147+
return Key.key(input.substring(start, index));
148148
}
149149

150150
public @NotNull BinaryTag readTag() {

‎src/main/java/net/minestom/server/component/DataComponent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package net.minestom.server.component;
22

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.nbt.BinaryTag;
45
import net.minestom.server.item.enchant.EffectComponent;
56
import net.minestom.server.network.NetworkBuffer;
67
import net.minestom.server.registry.StaticProtocolObject;
7-
import net.minestom.server.utils.NamespaceID;
88
import net.minestom.server.utils.nbt.BinaryTagSerializer;
99
import org.jetbrains.annotations.ApiStatus;
1010
import org.jetbrains.annotations.NotNull;
@@ -48,7 +48,7 @@ interface Holder {
4848

4949
@ApiStatus.Internal
5050
static <T> DataComponent<T> createHeadless(
51-
int id, @NotNull NamespaceID namespace,
51+
int id, @NotNull Key namespace,
5252
@Nullable NetworkBuffer.Type<T> network,
5353
@Nullable BinaryTagSerializer<T> nbt
5454
) {

‎src/main/java/net/minestom/server/component/DataComponentImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package net.minestom.server.component;
22

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.nbt.BinaryTag;
45
import net.minestom.server.network.NetworkBuffer;
5-
import net.minestom.server.utils.NamespaceID;
66
import net.minestom.server.utils.nbt.BinaryTagSerializer;
77
import net.minestom.server.utils.validate.Check;
88
import org.jetbrains.annotations.NotNull;
99
import org.jetbrains.annotations.Nullable;
1010

1111
record DataComponentImpl<T>(
1212
int id,
13-
@NotNull NamespaceID namespace,
13+
@NotNull Key namespace,
1414
@Nullable NetworkBuffer.Type<T> network,
1515
@Nullable BinaryTagSerializer<T> nbt
1616
) implements DataComponent<T> {

‎src/main/java/net/minestom/server/entity/EntityType.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package net.minestom.server.entity;
22

3-
import net.minestom.server.registry.StaticProtocolObject;
3+
import net.kyori.adventure.key.Key;
44
import net.minestom.server.registry.Registry;
5-
import net.minestom.server.utils.NamespaceID;
5+
import net.minestom.server.registry.StaticProtocolObject;
66
import org.jetbrains.annotations.Contract;
77
import org.jetbrains.annotations.NotNull;
88
import org.jetbrains.annotations.Nullable;
@@ -19,7 +19,7 @@ public sealed interface EntityType extends StaticProtocolObject, EntityTypes per
1919
@NotNull Registry.EntityEntry registry();
2020

2121
@Override
22-
default @NotNull NamespaceID namespace() {
22+
default @NotNull Key namespace() {
2323
return registry().namespace();
2424
}
2525

@@ -44,7 +44,7 @@ static EntityType fromNamespaceId(@NotNull String namespaceID) {
4444
return EntityTypeImpl.getSafe(namespaceID);
4545
}
4646

47-
static EntityType fromNamespaceId(@NotNull NamespaceID namespaceID) {
47+
static EntityType fromNamespaceId(@NotNull Key namespaceID) {
4848
return fromNamespaceId(namespaceID.asString());
4949
}
5050

‎src/main/java/net/minestom/server/entity/LivingEntity.java‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.minestom.server.entity;
22

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.sound.Sound.Source;
45
import net.minestom.server.collision.BoundingBox;
56
import net.minestom.server.coordinate.Point;
@@ -9,7 +10,6 @@
910
import net.minestom.server.entity.attribute.AttributeModifier;
1011
import net.minestom.server.entity.attribute.AttributeOperation;
1112
import net.minestom.server.entity.damage.Damage;
12-
import net.minestom.server.entity.damage.DamageType;
1313
import net.minestom.server.entity.metadata.EntityMeta;
1414
import net.minestom.server.entity.metadata.LivingEntityMeta;
1515
import net.minestom.server.event.EventDispatcher;
@@ -26,13 +26,15 @@
2626
import net.minestom.server.item.component.AttributeList;
2727
import net.minestom.server.network.ConnectionState;
2828
import net.minestom.server.network.packet.server.LazyPacket;
29-
import net.minestom.server.network.packet.server.play.*;
29+
import net.minestom.server.network.packet.server.play.CollectItemPacket;
30+
import net.minestom.server.network.packet.server.play.DamageEventPacket;
31+
import net.minestom.server.network.packet.server.play.EntityAnimationPacket;
32+
import net.minestom.server.network.packet.server.play.EntityAttributesPacket;
33+
import net.minestom.server.network.packet.server.play.SoundEffectPacket;
3034
import net.minestom.server.network.player.PlayerConnection;
31-
import net.minestom.server.registry.DynamicRegistry;
3235
import net.minestom.server.scoreboard.Team;
3336
import net.minestom.server.sound.SoundEvent;
3437
import net.minestom.server.thread.Acquirable;
35-
import net.minestom.server.utils.NamespaceID;
3638
import net.minestom.server.utils.block.BlockIterator;
3739
import net.minestom.server.utils.time.Cooldown;
3840
import net.minestom.server.utils.time.TimeUnit;
@@ -42,18 +44,25 @@
4244
import org.jetbrains.annotations.UnmodifiableView;
4345

4446
import java.time.Duration;
45-
import java.util.*;
47+
import java.util.ArrayList;
48+
import java.util.Collection;
49+
import java.util.Collections;
50+
import java.util.Iterator;
51+
import java.util.List;
52+
import java.util.Map;
53+
import java.util.Set;
54+
import java.util.UUID;
4655
import java.util.concurrent.ConcurrentHashMap;
4756

4857
public class LivingEntity extends Entity implements EquipmentHandler {
4958

50-
private static final AttributeModifier SPRINTING_SPEED_MODIFIER = new AttributeModifier(NamespaceID.from("minecraft:sprinting"), 0.3, AttributeOperation.MULTIPLY_TOTAL);
59+
private static final AttributeModifier SPRINTING_SPEED_MODIFIER = new AttributeModifier(Key.key("minecraft:sprinting"), 0.3, AttributeOperation.MULTIPLY_TOTAL);
5160

5261
/**
5362
* IDs of modifiers that are protected from removal by methods like {@link AttributeInstance#clearModifiers()}.
5463
*/
5564
@ApiStatus.Internal
56-
public static final Set<NamespaceID> PROTECTED_MODIFIERS = Set.of(SPRINTING_SPEED_MODIFIER.id());
65+
public static final Set<Key> PROTECTED_MODIFIERS = Set.of(SPRINTING_SPEED_MODIFIER.id());
5766

5867
// ItemStack pickup
5968
protected boolean canPickupItem;
@@ -313,7 +322,7 @@ public void setFireTicks(int ticks) {
313322
remainingFireTicks = fireTicks;
314323
}
315324

316-
public boolean damage(@NotNull DynamicRegistry.Key<DamageType> type, float amount) {
325+
public boolean damage(@NotNull Key type, float amount) {
317326
return damage(new Damage(type, null, null, null, amount));
318327
}
319328

@@ -383,7 +392,7 @@ public boolean damage(@NotNull Damage damage) {
383392
* @param type the type of damage
384393
* @return true if this entity is immune to the given type of damage
385394
*/
386-
public boolean isImmune(@NotNull DynamicRegistry.Key<DamageType> type) {
395+
public boolean isImmune(@NotNull Key type) {
387396
return false;
388397
}
389398

‎src/main/java/net/minestom/server/entity/Metadata.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.minestom.server.entity;
22

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.nbt.BinaryTag;
45
import net.kyori.adventure.text.Component;
56
import net.minestom.server.coordinate.Point;
@@ -145,15 +146,15 @@ public static Entry<CatMeta.Variant> CatVariant(@NotNull CatMeta.Variant value)
145146
return new MetadataImpl.EntryImpl<>(TYPE_CAT_VARIANT, value, CatMeta.Variant.NETWORK_TYPE);
146147
}
147148

148-
public static Entry<DynamicRegistry.Key<WolfMeta.Variant>> WolfVariant(@NotNull DynamicRegistry.Key<WolfMeta.Variant> value) {
149+
public static Entry<Key> WolfVariant(@NotNull Key value) {
149150
return new MetadataImpl.EntryImpl<>(TYPE_WOLF_VARIANT, value, WolfMeta.Variant.NETWORK_TYPE);
150151
}
151152

152153
public static Entry<FrogMeta.Variant> FrogVariant(@NotNull FrogMeta.Variant value) {
153154
return new MetadataImpl.EntryImpl<>(TYPE_FROG_VARIANT, value, FrogMeta.Variant.NETWORK_TYPE);
154155
}
155156

156-
public static Entry<DynamicRegistry.Key<PaintingMeta.Variant>> PaintingVariant(@NotNull DynamicRegistry.Key<PaintingMeta.Variant> value) {
157+
public static Entry<Key> PaintingVariant(@NotNull Key value) {
157158
return new MetadataImpl.EntryImpl<>(TYPE_PAINTING_VARIANT, value, PaintingMeta.Variant.NETWORK_TYPE);
158159
}
159160

‎src/main/java/net/minestom/server/entity/Player.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ public CompletableFuture<Void> UNSAFE_init() {
294294
this.pendingInstance = null;
295295

296296
this.removed = false;
297-
this.dimensionTypeId = DIMENSION_TYPE_REGISTRY.getId(spawnInstance.getDimensionType().namespace());
297+
this.dimensionTypeId = DIMENSION_TYPE_REGISTRY.getId(spawnInstance.getDimensionType());
298298

299299
final JoinGamePacket joinGamePacket = new JoinGamePacket(
300300
getEntityId(), this.hardcore, List.of(), 0,
@@ -1039,7 +1039,7 @@ public void openBook(@NotNull Book book) {
10391039
}
10401040

10411041
@Override
1042-
public boolean isImmune(@NotNull DynamicRegistry.Key<DamageType> type) {
1042+
public boolean isImmune(@NotNull Key type) {
10431043
if (!getGameMode().canTakeDamage()) {
10441044
return !DamageType.OUT_OF_WORLD.equals(type);
10451045
}
@@ -1673,7 +1673,7 @@ public boolean setGameMode(@NotNull GameMode gameMode) {
16731673
*
16741674
* @param dimensionType the new player dimension
16751675
*/
1676-
protected void sendDimension(@NotNull DynamicRegistry.Key<DimensionType> dimensionType, @NotNull String dimensionName) {
1676+
protected void sendDimension(@NotNull Key dimensionType, @NotNull String dimensionName) {
16771677
Check.argCondition(instance.getDimensionName().equals(dimensionName),
16781678
"The dimension needs to be different than the current one!");
16791679
this.dimensionTypeId = DIMENSION_TYPE_REGISTRY.getId(dimensionType);

0 commit comments

Comments
 (0)