Skip to content

Commit 9bd45e3

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

File tree

8 files changed

+45
-116
lines changed

8 files changed

+45
-116
lines changed

‎src/test/java/net/minestom/server/collision/EntityBlockTouchTickIntegrationTest.java‎

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

3-
import net.minestom.testing.Env;
3+
import net.kyori.adventure.key.Key;
44
import net.minestom.server.coordinate.Point;
55
import net.minestom.server.coordinate.Pos;
66
import net.minestom.server.coordinate.Vec;
77
import net.minestom.server.entity.Entity;
88
import net.minestom.server.entity.EntityType;
99
import net.minestom.server.instance.block.Block;
1010
import net.minestom.server.instance.block.BlockHandler;
11-
import net.minestom.server.utils.NamespaceID;
11+
import net.minestom.testing.Env;
1212
import net.minestom.testing.extension.MicrotusExtension;
1313
import org.jetbrains.annotations.NotNull;
1414
import org.junit.jupiter.api.Test;
@@ -34,8 +34,8 @@ public void onTouch(@NotNull Touch touch) {
3434
}
3535

3636
@Override
37-
public @NotNull NamespaceID getNamespaceId() {
38-
return NamespaceID.from("minestom:test");
37+
public @NotNull Key getNamespaceId() {
38+
return Key.key("minestom:test");
3939
}
4040
};
4141

@@ -73,8 +73,8 @@ public void onTouch(@NotNull Touch touch) {
7373
}
7474

7575
@Override
76-
public @NotNull NamespaceID getNamespaceId() {
77-
return NamespaceID.from("minestom:test");
76+
public @NotNull Key getNamespaceId() {
77+
return Key.key("minestom:test");
7878
}
7979
};
8080

@@ -113,8 +113,8 @@ public void onTouch(@NotNull Touch touch) {
113113
}
114114

115115
@Override
116-
public @NotNull NamespaceID getNamespaceId() {
117-
return NamespaceID.from("minestom:test");
116+
public @NotNull Key getNamespaceId() {
117+
return Key.key("minestom:test");
118118
}
119119
};
120120

@@ -161,8 +161,8 @@ public void onTouch(@NotNull Touch touch) {
161161
}
162162

163163
@Override
164-
public @NotNull NamespaceID getNamespaceId() {
165-
return NamespaceID.from("minestom:test");
164+
public @NotNull Key getNamespaceId() {
165+
return Key.key("minestom:test");
166166
}
167167
};
168168

‎src/test/java/net/minestom/server/entity/EntityAttributeTest.java‎

Lines changed: 4 additions & 4 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.minestom.server.coordinate.Pos;
45
import net.minestom.server.entity.attribute.Attribute;
56
import net.minestom.server.entity.attribute.AttributeModifier;
@@ -8,7 +9,6 @@
89
import net.minestom.server.item.ItemStack;
910
import net.minestom.server.item.Material;
1011
import net.minestom.server.item.component.AttributeList;
11-
import net.minestom.server.utils.NamespaceID;
1212
import net.minestom.testing.Env;
1313
import net.minestom.testing.extension.MicrotusExtension;
1414
import org.junit.jupiter.api.Test;
@@ -35,7 +35,7 @@ void testEntityUpdatesAttributes(Env env) {
3535

3636
ItemStack itemStack = ItemStack.builder(Material.DIAMOND).set(ItemComponent.ATTRIBUTE_MODIFIERS,
3737
new AttributeList(new AttributeList.Modifier(Attribute.GENERIC_MAX_HEALTH,
38-
new AttributeModifier(NamespaceID.from("minestom:health"), addition, AttributeOperation.ADD_VALUE), EquipmentSlotGroup.HEAD))).build();
38+
new AttributeModifier(Key.key("minestom:health"), addition, AttributeOperation.ADD_VALUE), EquipmentSlotGroup.HEAD))).build();
3939

4040
entity.setBoots(itemStack);
4141
assertEquals(0, Double.compare(entity.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(), baseHealth)); // No change since we are in the wrong slot
@@ -59,7 +59,7 @@ void testPlayerUpdatesAttributes(Env env) {
5959

6060
ItemStack itemStack = ItemStack.builder(Material.DIAMOND).set(ItemComponent.ATTRIBUTE_MODIFIERS,
6161
new AttributeList(new AttributeList.Modifier(Attribute.GENERIC_MAX_HEALTH,
62-
new AttributeModifier(NamespaceID.from("minestom:health"), addition, AttributeOperation.ADD_VALUE), EquipmentSlotGroup.MAIN_HAND))).build();
62+
new AttributeModifier(Key.key("minestom:health"), addition, AttributeOperation.ADD_VALUE), EquipmentSlotGroup.MAIN_HAND))).build();
6363

6464
player.setBoots(itemStack);
6565
assertEquals(0, Double.compare(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(), baseHealth)); // No change since we are in the wrong slot
@@ -85,7 +85,7 @@ void testDirectlyAddAttributes(Env env) {
8585

8686
ItemStack itemStack = ItemStack.builder(Material.DIAMOND).set(ItemComponent.ATTRIBUTE_MODIFIERS,
8787
new AttributeList(new AttributeList.Modifier(Attribute.GENERIC_MAX_HEALTH,
88-
new AttributeModifier(NamespaceID.from("minestom:health"), addition, AttributeOperation.ADD_VALUE), EquipmentSlotGroup.MAIN_HAND))).build();
88+
new AttributeModifier(Key.key("minestom:health"), addition, AttributeOperation.ADD_VALUE), EquipmentSlotGroup.MAIN_HAND))).build();
8989

9090
player.setItemInMainHand(itemStack);
9191
assertEquals(0, Double.compare(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(), baseHealth + addition));

‎src/test/java/net/minestom/server/entity/player/PlayerIntegrationTest.java‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,33 @@
11
package net.minestom.server.entity.player;
22

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.text.Component;
45
import net.minestom.server.coordinate.Point;
56
import net.minestom.server.coordinate.Pos;
67
import net.minestom.server.coordinate.Vec;
7-
import net.minestom.server.entity.*;
8+
import net.minestom.server.entity.Entity;
9+
import net.minestom.server.entity.EntityType;
10+
import net.minestom.server.entity.GameMode;
11+
import net.minestom.server.entity.Player;
12+
import net.minestom.server.entity.RelativeFlags;
813
import net.minestom.server.entity.damage.DamageType;
914
import net.minestom.server.event.player.PlayerGameModeChangeEvent;
1015
import net.minestom.server.message.ChatMessageType;
1116
import net.minestom.server.network.packet.client.common.ClientSettingsPacket;
1217
import net.minestom.server.network.packet.server.ServerPacket;
13-
import net.minestom.server.network.packet.server.play.*;
14-
import net.minestom.server.utils.NamespaceID;
18+
import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
19+
import net.minestom.server.network.packet.server.play.EntityAttributesPacket;
20+
import net.minestom.server.network.packet.server.play.EntityMetaDataPacket;
21+
import net.minestom.server.network.packet.server.play.EntityStatusPacket;
22+
import net.minestom.server.network.packet.server.play.FacePlayerPacket;
23+
import net.minestom.server.network.packet.server.play.JoinGamePacket;
24+
import net.minestom.server.network.packet.server.play.PlayerAbilitiesPacket;
25+
import net.minestom.server.network.packet.server.play.PlayerInfoUpdatePacket;
26+
import net.minestom.server.network.packet.server.play.PlayerPositionAndLookPacket;
27+
import net.minestom.server.network.packet.server.play.ServerDifficultyPacket;
28+
import net.minestom.server.network.packet.server.play.SetExperiencePacket;
29+
import net.minestom.server.network.packet.server.play.SpawnPositionPacket;
30+
import net.minestom.server.network.packet.server.play.UpdateHealthPacket;
1531
import net.minestom.server.world.DimensionType;
1632
import net.minestom.testing.Collector;
1733
import net.minestom.testing.Env;
@@ -146,7 +162,7 @@ void playerJoinPackets(Env env) {
146162
@Test
147163
void refreshPlayerTest(Env env) {
148164
final int TEST_PERMISSION_LEVEL = 2;
149-
final var testDimension = env.process().dimensionType().register(NamespaceID.from("minestom:test_dimension"), DimensionType.builder().build());
165+
final var testDimension = env.process().dimensionType().register(Key.key("minestom:test_dimension"), DimensionType.builder().build());
150166

151167
var instance = env.createFlatInstance();
152168
var instance2 = env.process().instance().createInstanceContainer(testDimension);
@@ -181,7 +197,7 @@ void refreshPlayerTest(Env env) {
181197
@Test
182198
void deathLocationTest(Env env) {
183199
String dimensionNamespace = "minestom:test_dimension";
184-
final var testDimension = env.process().dimensionType().register(NamespaceID.from(dimensionNamespace), DimensionType.builder().build());
200+
final var testDimension = env.process().dimensionType().register(Key.key(dimensionNamespace), DimensionType.builder().build());
185201

186202
var instance = env.process().instance().createInstanceContainer(testDimension);
187203
var connection = env.createConnection();

‎src/test/java/net/minestom/server/instance/BlockClientNbtTest.java‎

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

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.nbt.CompoundBinaryTag;
45
import net.minestom.server.instance.block.Block;
56
import net.minestom.server.instance.block.BlockHandler;
67
import net.minestom.server.tag.Tag;
7-
import net.minestom.server.utils.NamespaceID;
88
import net.minestom.server.utils.block.BlockUtils;
99
import org.jetbrains.annotations.NotNull;
1010
import org.junit.jupiter.api.Test;
@@ -36,8 +36,8 @@ void handler() {
3636
}
3737

3838
@Override
39-
public @NotNull NamespaceID getNamespaceId() {
40-
return NamespaceID.from("minestom:test");
39+
public @NotNull Key getNamespaceId() {
40+
return Key.key("minestom:test");
4141
}
4242
};
4343

‎src/test/java/net/minestom/server/instance/InstanceBlockPacketIntegrationTest.java‎

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

3+
import net.kyori.adventure.key.Key;
34
import net.kyori.adventure.nbt.CompoundBinaryTag;
45
import net.kyori.adventure.nbt.TagStringIOExt;
56
import net.minestom.server.coordinate.Pos;
@@ -9,7 +10,6 @@
910
import net.minestom.server.network.packet.server.play.BlockChangePacket;
1011
import net.minestom.server.network.packet.server.play.BlockEntityDataPacket;
1112
import net.minestom.server.tag.Tag;
12-
import net.minestom.server.utils.NamespaceID;
1313
import net.minestom.testing.Env;
1414
import net.minestom.testing.extension.MicrotusExtension;
1515
import org.jetbrains.annotations.NotNull;
@@ -64,8 +64,8 @@ void placeBlockEntity(Env env) {
6464
}
6565

6666
@Override
67-
public @NotNull NamespaceID getNamespaceId() {
68-
return NamespaceID.from("minecraft:sign");
67+
public @NotNull Key getNamespaceId() {
68+
return Key.key("minecraft:sign");
6969
}
7070
};
7171

‎src/test/java/net/minestom/server/instance/anvil/AnvilLoaderIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public boolean supportsParallelSaving() {
108108
for (int y = 0; y < 16; y++) {
109109
for (int x = 0; x < 16; x++) {
110110
for (int z = 0; z < 16; z++) {
111-
DynamicRegistry.Key<Biome> b = chunk.getBiome(x, y, z);
111+
var b = chunk.getBiome(x, y, z);
112112
assertEquals(Biome.PLAINS, b);
113113
}
114114
}

‎src/test/java/net/minestom/server/instance/block/SuspiciousGravelBlockHandler.java‎

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

3+
import net.kyori.adventure.key.Key;
34
import net.minestom.server.item.ItemStack;
45
import net.minestom.server.tag.Tag;
5-
import net.minestom.server.utils.NamespaceID;
66
import org.jetbrains.annotations.NotNull;
77

88
import java.util.Collection;
@@ -22,8 +22,8 @@ public SuspiciousGravelBlockHandler(boolean hasTags) {
2222
}
2323

2424
@Override
25-
public @NotNull NamespaceID getNamespaceId() {
26-
return NamespaceID.from("minecraft:suspicious_gravel");
25+
public @NotNull Key getNamespaceId() {
26+
return Key.key("minecraft:suspicious_gravel");
2727
}
2828

2929
@Override

‎src/test/java/net/minestom/server/utils/NamespaceIDTest.java‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)