Skip to content

Commit 54f1627

Browse files
committed
chore(codebase): migrate imports and other parts to the updated code base
1 parent d925dd8 commit 54f1627

File tree

7 files changed

+12
-13
lines changed

7 files changed

+12
-13
lines changed

common/src/main/java/net/onelitefeather/cygnus/common/ListenerHandling.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import net.minestom.server.event.player.PlayerSwapItemEvent;
1010
import org.jetbrains.annotations.NotNull;
1111

12-
import static de.icevizion.aves.inventory.util.InventoryConstants.CANCELLABLE_EVENT;
12+
import static net.theevilreaper.aves.inventory.util.InventoryConstants.CANCELLABLE_EVENT;
1313

1414
/**
1515
* The interface provides a default method to register some listeners to cancel specific events.

common/src/main/java/net/onelitefeather/cygnus/common/map/GameMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.onelitefeather.cygnus.common.map;
22

3-
import de.icevizion.aves.map.BaseMap;
3+
import net.theevilreaper.aves.map.BaseMap;
44
import net.minestom.server.coordinate.Pos;
55
import net.minestom.server.coordinate.Vec;
66
import net.minestom.server.utils.Direction;
@@ -12,7 +12,7 @@
1212
import java.util.Set;
1313

1414
/**
15-
* The class contains all data which are required for the game to run.
15+
* The class contains all data that are required for the game to run.
1616
* It inherits from the {@link BaseMap} to use the properties from it
1717
*
1818
* @author theEvilReaper

common/src/main/java/net/onelitefeather/cygnus/common/map/MapProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package net.onelitefeather.cygnus.common.map;
22

33
import com.google.gson.Gson;
4-
import de.icevizion.aves.file.GsonFileHandler;
5-
import de.icevizion.aves.file.gson.PositionGsonAdapter;
6-
import de.icevizion.aves.map.BaseMap;
4+
import net.theevilreaper.aves.file.GsonFileHandler;
5+
import net.theevilreaper.aves.file.gson.PositionGsonAdapter;
6+
import net.theevilreaper.aves.map.BaseMap;
77
import net.minestom.server.MinecraftServer;
88
import net.minestom.server.coordinate.Point;
99
import net.minestom.server.coordinate.Pos;

common/src/main/java/net/onelitefeather/cygnus/common/page/PageProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.onelitefeather.cygnus.common.page;
22

3-
import de.icevizion.aves.util.Broadcaster;
4-
import de.icevizion.aves.util.functional.VoidConsumer;
53
import net.kyori.adventure.text.Component;
64
import net.kyori.adventure.text.format.NamedTextColor;
75
import net.minestom.server.coordinate.Pos;
@@ -11,6 +9,8 @@
119
import net.minestom.server.utils.validate.Check;
1210
import net.onelitefeather.cygnus.common.Messages;
1311
import net.onelitefeather.cygnus.common.util.Helper;
12+
import net.theevilreaper.aves.util.Broadcaster;
13+
import net.theevilreaper.aves.util.functional.VoidConsumer;
1414
import org.jetbrains.annotations.NotNull;
1515
import org.slf4j.Logger;
1616
import org.slf4j.LoggerFactory;

common/src/test/java/net/onelitefeather/cygnus/common/page/PageEntityTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import net.kyori.adventure.text.Component;
44
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
5+
import net.minestom.server.component.DataComponents;
56
import net.minestom.server.coordinate.Pos;
67
import net.minestom.server.instance.Instance;
7-
import net.minestom.server.item.ItemComponent;
88
import net.minestom.testing.Env;
99
import net.minestom.testing.extension.MicrotusExtension;
1010
import org.jetbrains.annotations.NotNull;
@@ -26,7 +26,7 @@ void testPageEntityCreation(@NotNull Env env) {
2626
assertNotNull(pageEntity.getPageItem());
2727
assertEquals(Pos.ZERO, pageEntity.getPosition());
2828
assertNotEquals(pageEntity.getUuid(), pageEntity.getHitBoxUUID());
29-
Component displayName = pageEntity.getPageItem().get(ItemComponent.CUSTOM_NAME);
29+
Component displayName = pageEntity.getPageItem().get(DataComponents.CUSTOM_NAME);
3030

3131
assertNotNull(displayName);
3232

common/src/test/java/net/onelitefeather/cygnus/common/page/PageFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void testPageCreationViaFactory(@NotNull Env env) {
4949

5050
assertNotNull(pageEntity);
5151
assertEquals(Pos.ZERO, pageEntity.getPosition());
52-
assertEquals(instance.getUniqueId(), pageEntity.getInstance().getUniqueId());
52+
assertEquals(instance.getUuid(), pageEntity.getInstance().getUuid());
5353
pageEntity.remove();
5454

5555
env.destroyInstance(instance);

common/src/test/java/net/onelitefeather/cygnus/common/page/adapter/PageResourceAdapterTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;
5-
import de.icevizion.aves.file.gson.PositionGsonAdapter;
5+
import net.theevilreaper.aves.file.gson.PositionGsonAdapter;
66
import net.minestom.server.coordinate.Pos;
77
import net.minestom.server.coordinate.Vec;
88
import net.minestom.server.utils.Direction;
99
import net.onelitefeather.cygnus.common.page.PageResource;
10-
import net.onelitefeather.cygnus.common.util.DirectionFaceHelper;
1110
import org.junit.jupiter.api.AfterAll;
1211
import org.junit.jupiter.api.BeforeAll;
1312
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)