From 406d0cc87671587bf3c812d5ace7cff7b934c028 Mon Sep 17 00:00:00 2001 From: mworzala Date: Sat, 17 Sep 2022 08:23:46 -0400 Subject: [PATCH] rebase fixes --- .../java/net/hollowcube/server/dev/Main.java | 105 +---------- .../java/unnamed/mmo/server/dev/Main.java | 164 ------------------ .../entity/EntityMqlQueryContext.java | 12 +- .../entity/HeadRotationZombie.java | 2 +- .../hollowcube}/entity/UnnamedEntity.java | 8 +- .../hollowcube}/entity/brain/Brain.java | 4 +- .../entity/brain/SingleTaskBrain.java | 6 +- .../brain/navigator/CustomNavigator.java | 4 +- .../brain/navigator/HydrazineNavigator.java | 4 +- .../entity/brain/navigator/Navigator.java | 7 +- .../stimuli/NearbyEntityStimuliSource.java | 6 +- .../entity/brain/stimuli/StimuliSource.java | 4 +- .../entity/brain/task/AbstractTask.java | 4 +- .../entity/brain/task/FollowTargetTask.java | 6 +- .../entity/brain/task/IdleTask.java | 8 +- .../entity/brain/task/SelectorTask.java | 16 +- .../entity/brain/task/SequenceTask.java | 6 +- .../hollowcube}/entity/brain/task/Task.java | 8 +- .../entity/brain/task/WanderInRegionTask.java | 4 +- .../entity/motion/MotionNavigator.java | 5 +- .../entity/motion/MotionNavigatorSlime.java | 6 +- .../hollowcube}/entity/motion/Path.java | 2 +- .../entity/motion/PathGenerator.java | 4 +- .../entity/motion/PathOptimizer.java | 5 +- .../hollowcube}/entity/motion/Pathfinder.java | 2 +- .../entity/motion/util/PhysicsUtil.java | 2 +- .../entity/pathfinding/PFNavigator.java | 2 +- .../pathfinding/PFNeighborSupplier.java | 2 +- .../entity/pathfinding/PFNode.java | 2 +- .../entity/pathfinding/PFPath.java | 2 +- .../entity/pathfinding/PFPathGenerator.java | 3 +- .../entity/pathfinding/PFPathOptimizer.java | 2 +- .../mmo => net/hollowcube}/mql/MqlScript.java | 16 +- .../mmo => net/hollowcube}/mql/README.md | 0 .../hollowcube}/mql/parser/MqlLexer.java | 2 +- .../hollowcube}/mql/parser/MqlParseError.java | 2 +- .../hollowcube}/mql/parser/MqlParser.java | 5 +- .../hollowcube}/mql/parser/MqlToken.java | 2 +- .../mql/runtime/MqlRuntimeError.java | 2 +- .../hollowcube}/mql/runtime/MqlScope.java | 4 +- .../hollowcube}/mql/tree/MqlAccessExpr.java | 8 +- .../hollowcube}/mql/tree/MqlBinaryExpr.java | 8 +- .../hollowcube}/mql/tree/MqlExpr.java | 6 +- .../hollowcube}/mql/tree/MqlIdentExpr.java | 7 +- .../hollowcube}/mql/tree/MqlNumberExpr.java | 8 +- .../hollowcube}/mql/tree/MqlPrinter.java | 2 +- .../hollowcube}/mql/tree/MqlVisitor.java | 2 +- .../hollowcube}/mql/value/MqlCallable.java | 2 +- .../hollowcube}/mql/value/MqlHolder.java | 2 +- .../hollowcube}/mql/value/MqlIdentValue.java | 2 +- .../hollowcube}/mql/value/MqlNull.java | 2 +- .../hollowcube/mql/value/MqlNumberValue.java | 9 + .../hollowcube}/mql/value/MqlValue.java | 4 +- .../unnamed/mmo/mql/value/MqlNumberValue.java | 4 - .../TestNavigatorBasicIntegration.java | 6 +- .../entity/brain/navigator/TestUtil.java | 4 +- .../task/TestFollowTargetTaskIntegration.java | 2 +- .../entity/brain/task/TestIdleTask.java | 6 +- .../entity/brain/task/TestSequenceTask.java | 18 +- .../entity/brain/task/test/MockBrain.java | 6 +- .../entity/brain/task/test/MockTask.java | 7 +- .../entity/brain/task/test/TaskSubject.java | 4 +- .../entity/motion/TestPathGeneratorLand.java | 4 +- .../entity/motion/TestPathGeneratorWater.java | 4 +- .../motion/TestPathOptimizerStringPull.java | 4 +- .../entity/motion/TestPathfinderAStar.java | 4 +- .../entity/motion/util/TestPhysicsUtil.java | 4 +- .../mmo => net/hollowcube}/mql/MqlTest.java | 14 +- .../hollowcube}/mql/parser/TestMqlLexer.java | 2 +- .../hollowcube}/mql/parser/TestMqlParser.java | 4 +- .../hollowcube}/test/MockBlockGetter.java | 2 +- 71 files changed, 171 insertions(+), 440 deletions(-) delete mode 100644 modules/development/src/main/java/unnamed/mmo/server/dev/Main.java rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/EntityMqlQueryContext.java (75%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/HeadRotationZombie.java (98%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/UnnamedEntity.java (89%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/Brain.java (85%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/SingleTaskBrain.java (93%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/navigator/CustomNavigator.java (86%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/navigator/HydrazineNavigator.java (87%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/navigator/Navigator.java (82%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/stimuli/NearbyEntityStimuliSource.java (88%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/stimuli/StimuliSource.java (58%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/AbstractTask.java (84%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/FollowTargetTask.java (92%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/IdleTask.java (88%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/SelectorTask.java (91%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/SequenceTask.java (94%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/Task.java (87%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/WanderInRegionTask.java (94%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/motion/MotionNavigator.java (98%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/motion/MotionNavigatorSlime.java (96%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/motion/Path.java (88%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/motion/PathGenerator.java (96%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/motion/PathOptimizer.java (90%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/motion/Pathfinder.java (98%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/motion/util/PhysicsUtil.java (99%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/pathfinding/PFNavigator.java (99%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/pathfinding/PFNeighborSupplier.java (98%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/pathfinding/PFNode.java (96%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/pathfinding/PFPath.java (95%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/pathfinding/PFPathGenerator.java (97%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/entity/pathfinding/PFPathOptimizer.java (98%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/MqlScript.java (79%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/README.md (100%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/parser/MqlLexer.java (98%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/parser/MqlParseError.java (84%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/parser/MqlParser.java (95%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/parser/MqlToken.java (83%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/runtime/MqlRuntimeError.java (83%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/runtime/MqlScope.java (67%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/tree/MqlAccessExpr.java (74%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/tree/MqlBinaryExpr.java (80%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/tree/MqlExpr.java (68%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/tree/MqlIdentExpr.java (70%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/tree/MqlNumberExpr.java (73%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/tree/MqlPrinter.java (96%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/tree/MqlVisitor.java (94%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/value/MqlCallable.java (86%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/value/MqlHolder.java (81%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/value/MqlIdentValue.java (84%) rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/value/MqlNull.java (79%) create mode 100644 modules/entity/src/main/java/net/hollowcube/mql/value/MqlNumberValue.java rename modules/entity/src/main/java/{unnamed/mmo => net/hollowcube}/mql/value/MqlValue.java (89%) delete mode 100644 modules/entity/src/main/java/unnamed/mmo/mql/value/MqlNumberValue.java rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/navigator/TestNavigatorBasicIntegration.java (92%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/navigator/TestUtil.java (85%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/TestFollowTargetTaskIntegration.java (87%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/TestIdleTask.java (82%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/TestSequenceTask.java (75%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/test/MockBrain.java (77%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/test/MockTask.java (69%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/brain/task/test/TaskSubject.java (90%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/motion/TestPathGeneratorLand.java (97%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/motion/TestPathGeneratorWater.java (96%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/motion/TestPathOptimizerStringPull.java (97%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/motion/TestPathfinderAStar.java (96%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/entity/motion/util/TestPhysicsUtil.java (97%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/mql/MqlTest.java (78%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/mql/parser/TestMqlLexer.java (97%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/mql/parser/TestMqlParser.java (94%) rename modules/entity/src/test/java/{unnamed/mmo => net/hollowcube}/test/MockBlockGetter.java (98%) diff --git a/modules/development/src/main/java/net/hollowcube/server/dev/Main.java b/modules/development/src/main/java/net/hollowcube/server/dev/Main.java index 522d93aa..c5a1d1fa 100644 --- a/modules/development/src/main/java/net/hollowcube/server/dev/Main.java +++ b/modules/development/src/main/java/net/hollowcube/server/dev/Main.java @@ -2,44 +2,23 @@ import net.hollowcube.item.crafting.RecipeList; import net.hollowcube.item.crafting.ToolCraftingInventory; -import net.hollowcube.player.PlayerImpl; import net.hollowcube.server.dev.tool.DebugToolManager; -import net.hollowcube.server.instance.TickTrackingInstance; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; -import com.mattworzala.debug.DebugMessage; -import com.mattworzala.debug.Layer; -import com.mattworzala.debug.shape.Line; -import com.mattworzala.debug.shape.Text; -import com.mojang.serialization.JsonOps; -import net.kyori.adventure.audience.Audience; import net.minestom.server.MinecraftServer; import net.minestom.server.ServerProcess; import net.minestom.server.command.builder.Command; -import net.minestom.server.adventure.MinestomAdventure; -import net.minestom.server.command.builder.Command; import net.minestom.server.coordinate.Pos; +import net.minestom.server.entity.GameMode; import net.minestom.server.entity.Player; import net.minestom.server.event.EventNode; import net.minestom.server.event.GlobalEventHandler; import net.minestom.server.event.player.PlayerLoginEvent; -import net.minestom.server.event.player.PlayerPacketOutEvent; +import net.minestom.server.event.player.PlayerSpawnEvent; import net.minestom.server.instance.Instance; import net.minestom.server.instance.InstanceManager; import net.minestom.server.instance.block.Block; -import net.minestom.server.network.packet.server.CachedPacket; -import net.minestom.server.network.packet.server.FramedPacket; -import net.minestom.server.network.packet.server.LazyPacket; -import net.minestom.server.network.packet.server.SendablePacket; import net.minestom.server.instance.block.BlockHandler; -import net.minestom.server.network.packet.server.*; -import net.minestom.server.network.packet.server.play.EntityHeadLookPacket; -import net.minestom.server.network.packet.server.play.EntityPositionAndRotationPacket; -import net.minestom.server.network.packet.server.play.EntityRotationPacket; import net.minestom.server.potion.Potion; import net.minestom.server.potion.PotionEffect; -import net.minestom.server.utils.NamespaceID; -import net.minestom.server.world.DimensionType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import net.hollowcube.blocks.BlockInteracter; @@ -48,35 +27,11 @@ import net.hollowcube.server.Facet; import net.hollowcube.server.ServerWrapper; import net.hollowcube.server.dev.command.BaseCommandRegister; -import unnamed.mmo.blocks.BlockInteracter; -import unnamed.mmo.blocks.ore.Ore; -import unnamed.mmo.chat.ChatManager; -import unnamed.mmo.chat.storage.ChatStorage; -import unnamed.mmo.command.BaseCommandRegister; -import unnamed.mmo.damage.DamageProcessor; -import unnamed.mmo.data.number.NumberProvider; -import unnamed.mmo.entity.HeadRotationZombie; -import unnamed.mmo.logging.LoggerFactory; -import unnamed.mmo.entity.UnnamedEntity; -import unnamed.mmo.entity.brain.task.*; -import unnamed.mmo.item.Item; -import unnamed.mmo.damage.DamageProcessor; -import unnamed.mmo.item.Item; -import unnamed.mmo.item.ItemManager; -import unnamed.mmo.mql.MqlScript; -import unnamed.mmo.item.entity.OwnedItemEntity; -import unnamed.mmo.player.PlayerImpl; -import unnamed.mmo.quest.QuestFacet; -import unnamed.mmo.server.dev.tool.DebugToolManager; -import unnamed.mmo.server.instance.TickTrackingInstance; - -import java.util.List; + import java.util.HashMap; import java.util.Map; import java.util.ServiceLoader; -import java.util.UUID; import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -115,60 +70,6 @@ public static void main(String[] args) { //todo a command for this player.getInventory().addItemStack(DebugToolManager.createTool("unnamed:hello")); - - //todo test entity -// JsonElement json = JsonParser.parseString(""" -// { -// "type": "unnamed:selector", -// "children": { -// "q.has_target": { -// "type": "unnamed:follow_target" -// }, -// "": { -// "type": "unnamed:sequence", -// "children": [ -// { -// "type": "unnamed:wander_in_region" -// }, -// { -// "type": "unnamed:idle", -// "time": 5 -// } -// ], -// -// "canInterrupt": true -// } -// } -// }"""); -// JsonElement json = JsonParser.parseString(""" -// { -// "type": "unnamed:sequence", -// "children": [ -// { -// "type": "unnamed:wander_in_region" -// }, -// { -// "type": "unnamed:idle", -// "time": 20 -// } -// ] -// }"""); -// Task task = JsonOps.INSTANCE.withDecoder(Task.Spec.CODEC) -// .apply(json).getOrThrow(false, System.err::println).getFirst().create(); -// UnnamedEntity entity = new UnnamedEntity(task); -// entity.setInstance(instance, new Pos(0, 40, 0)) -// .thenAccept(unused -> System.out.println("Spawned")); - -// Entity entity = new Entity(EntityType.ZOMBIE) { -// @Override -// public void tick(long time) { -// super.tick(time); -// -// lookAt(player); -// } -// }; - Entity entity = new HeadRotationZombie(); - entity.setInstance(instance, new Pos(0, 40, 0)); }); BaseCommandRegister.registerCommands(); //todo this should be in a facet? diff --git a/modules/development/src/main/java/unnamed/mmo/server/dev/Main.java b/modules/development/src/main/java/unnamed/mmo/server/dev/Main.java deleted file mode 100644 index 19962488..00000000 --- a/modules/development/src/main/java/unnamed/mmo/server/dev/Main.java +++ /dev/null @@ -1,164 +0,0 @@ -package unnamed.mmo.server.dev; - -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; -import com.mattworzala.debug.DebugMessage; -import com.mojang.serialization.JsonOps; -import net.minestom.server.MinecraftServer; -import net.minestom.server.command.builder.Command; -import net.minestom.server.coordinate.Pos; -import net.minestom.server.entity.GameMode; -import net.minestom.server.entity.Player; -import net.minestom.server.event.GlobalEventHandler; -import net.minestom.server.event.player.PlayerLoginEvent; -import net.minestom.server.event.player.PlayerSpawnEvent; -import net.minestom.server.extras.MojangAuth; -import net.minestom.server.instance.Instance; -import net.minestom.server.instance.InstanceManager; -import net.minestom.server.instance.block.Block; -import net.minestom.server.potion.Potion; -import net.minestom.server.potion.PotionEffect; -import net.minestom.server.world.DimensionType; -import unnamed.mmo.blocks.BlockInteracter; -import unnamed.mmo.blocks.ore.Ore; -import unnamed.mmo.chat.ChatManager; -import unnamed.mmo.chat.storage.ChatStorage; -import unnamed.mmo.command.BaseCommandRegister; -import unnamed.mmo.damage.DamageProcessor; -import unnamed.mmo.entity.UnnamedEntity; -import unnamed.mmo.entity.brain.task.SelectorTask; -import unnamed.mmo.entity.brain.task.Task; -import unnamed.mmo.item.Item; -import unnamed.mmo.item.ItemManager; -import unnamed.mmo.item.entity.OwnedItemEntity; -import unnamed.mmo.player.PlayerImpl; -import unnamed.mmo.quest.QuestFacet; -import unnamed.mmo.server.dev.tool.DebugToolManager; -import unnamed.mmo.server.instance.TickTrackingInstance; - -import java.util.UUID; -import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.TimeUnit; - -public class Main { - - public static void main(String[] args) { - System.setProperty("minestom.terminal.disabled", "true"); -// System.setProperty("minestom.viewable-packet", "false"); - - MinecraftServer server = MinecraftServer.init(); - - InstanceManager instanceManager = MinecraftServer.getInstanceManager(); - Instance instance = new TickTrackingInstance(UUID.randomUUID(), DimensionType.OVERWORLD); - instanceManager.registerInstance(instance); - instance.setGenerator(unit -> unit.modifier().fillHeight(0, 40, Block.STONE)); - - // - GlobalEventHandler eventHandler = MinecraftServer.getGlobalEventHandler(); - eventHandler.addListener(PlayerLoginEvent.class, event -> { - final Player player = event.getPlayer(); - event.setSpawningInstance(instance); - player.setRespawnPoint(new Pos(0, 40, 0)); - }); - - MojangAuth.init(); - MinecraftServer.getConnectionManager().setPlayerProvider(PlayerImpl::new); - - eventHandler.addListener(PlayerSpawnEvent.class, event -> { - final Player player = event.getPlayer(); - player.setGameMode(GameMode.SURVIVAL); - player.setPermissionLevel(4); - player.setAllowFlying(true); - - // Testing - event.getSpawnInstance().setBlock(5, 43, 5, Ore.fromNamespaceId("unnamed:gold_ore").asBlock()); - event.getSpawnInstance().setBlock(4, 43, 5, Ore.fromNamespaceId("unnamed:diamond_ore").asBlock()); - player.getInventory().addItemStack(Item.fromNamespaceId("unnamed:diamond_pickaxe").asItemStack()); - - //todo this needs to be done elsewhere - player.addEffect(new Potion(PotionEffect.MINING_FATIGUE, (byte) -1, Short.MAX_VALUE, (byte) 0x0)); - - //todo a command for this - player.getInventory().addItemStack(DebugToolManager.createTool("unnamed:hello")); - - - //todo test entity - JsonElement json = JsonParser.parseString(""" - { - "type": "unnamed:selector", - "children": { - "q.has_target": { - "type": "unnamed:follow_target" - }, - "": { - "type": "unnamed:sequence", - "children": [ - { - "type": "unnamed:wander_in_region" - }, - { - "type": "unnamed:idle", - "time": 5 - } - ], - - "canInterrupt": true - } - } - }"""); -// JsonElement json = JsonParser.parseString(""" -// { -// "type": "unnamed:sequence", -// "children": [ -// { -// "type": "unnamed:wander_in_region" -// }, -// { -// "type": "unnamed:idle", -// "time": 20 -// } -// ] -// }"""); - Task task = JsonOps.INSTANCE.withDecoder(SelectorTask.Spec.CODEC) - .apply(json).getOrThrow(false, System.err::println).getFirst().create(); - UnnamedEntity entity = new UnnamedEntity(task); - entity.setInstance(instance, new Pos(0, 40, 0)) - .thenAccept(unused -> System.out.println("Spawned")); - }); - - BaseCommandRegister.registerCommands(); - - Command c = new Command("clear"); - c.setDefaultExecutor((sender, context) -> { - DebugMessage.builder().clear().build().sendTo(sender); - }); - MinecraftServer.getCommandManager().register(c); - - ChatStorage chatStorage = ChatStorage.noop(); - ChatManager chatManager = new ChatManager(chatStorage); - chatManager.hook(MinecraftServer.process()); - - //todo properly implement a config system & use facets better - ItemManager itemManager = new ItemManager(); - itemManager.hook(MinecraftServer.process()); - OwnedItemEntity.Handler itemEntityHandler = new OwnedItemEntity.Handler(); - itemEntityHandler.hook(MinecraftServer.process()); - - //todo stupid facet implementation - DebugToolManager debugToolManager = new DebugToolManager(); - debugToolManager.hook(MinecraftServer.process()); - - QuestFacet questFacet = new QuestFacet(); - questFacet.hook(MinecraftServer.process()); - - MinecraftServer.getSchedulerManager().buildShutdownTask(() -> - ForkJoinPool.commonPool().awaitQuiescence(10, TimeUnit.SECONDS)); - - BlockInteracter.registerEvents(); - DamageProcessor.init(); - - server.start("0.0.0.0", 25565); - - } - -} diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/EntityMqlQueryContext.java b/modules/entity/src/main/java/net/hollowcube/entity/EntityMqlQueryContext.java similarity index 75% rename from modules/entity/src/main/java/unnamed/mmo/entity/EntityMqlQueryContext.java rename to modules/entity/src/main/java/net/hollowcube/entity/EntityMqlQueryContext.java index d83855d1..23ecac23 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/EntityMqlQueryContext.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/EntityMqlQueryContext.java @@ -1,12 +1,10 @@ -package unnamed.mmo.entity; +package net.hollowcube.entity; -import net.minestom.server.entity.Entity; -import net.minestom.server.entity.LivingEntity; +import net.hollowcube.mql.runtime.MqlRuntimeError; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlHolder; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.runtime.MqlRuntimeError; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.value.MqlHolder; -import unnamed.mmo.mql.value.MqlValue; +import net.hollowcube.mql.value.MqlValue; //todo this whole class sucks, need to work out mql querying better public record EntityMqlQueryContext(@NotNull UnnamedEntity entity) implements MqlScope { diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/HeadRotationZombie.java b/modules/entity/src/main/java/net/hollowcube/entity/HeadRotationZombie.java similarity index 98% rename from modules/entity/src/main/java/unnamed/mmo/entity/HeadRotationZombie.java rename to modules/entity/src/main/java/net/hollowcube/entity/HeadRotationZombie.java index 7c88ee61..a79830bf 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/HeadRotationZombie.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/HeadRotationZombie.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity; +package net.hollowcube.entity; import net.minestom.server.collision.CollisionUtils; import net.minestom.server.coordinate.Point; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/UnnamedEntity.java b/modules/entity/src/main/java/net/hollowcube/entity/UnnamedEntity.java similarity index 89% rename from modules/entity/src/main/java/unnamed/mmo/entity/UnnamedEntity.java rename to modules/entity/src/main/java/net/hollowcube/entity/UnnamedEntity.java index 201d3b09..d1dc9cf4 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/UnnamedEntity.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/UnnamedEntity.java @@ -1,5 +1,8 @@ -package unnamed.mmo.entity; +package net.hollowcube.entity; +import net.hollowcube.entity.brain.Brain; +import net.hollowcube.entity.brain.SingleTaskBrain; +import net.hollowcube.entity.brain.task.Task; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Entity; import net.minestom.server.entity.EntityType; @@ -9,9 +12,6 @@ import net.minestom.server.event.entity.EntityAttackEvent; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; -import unnamed.mmo.entity.brain.SingleTaskBrain; -import unnamed.mmo.entity.brain.task.Task; import java.util.concurrent.CompletableFuture; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/Brain.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/Brain.java similarity index 85% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/Brain.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/Brain.java index 03565723..58c367d3 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/Brain.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/Brain.java @@ -1,11 +1,11 @@ -package unnamed.mmo.entity.brain; +package net.hollowcube.entity.brain; +import net.hollowcube.entity.brain.navigator.Navigator; import net.minestom.server.coordinate.Point; import net.minestom.server.entity.Entity; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import unnamed.mmo.entity.brain.navigator.Navigator; public interface Brain { diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/SingleTaskBrain.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/SingleTaskBrain.java similarity index 93% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/SingleTaskBrain.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/SingleTaskBrain.java index ff9ed879..cc7202db 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/SingleTaskBrain.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/SingleTaskBrain.java @@ -1,12 +1,12 @@ -package unnamed.mmo.entity.brain; +package net.hollowcube.entity.brain; +import net.hollowcube.entity.brain.navigator.Navigator; +import net.hollowcube.entity.brain.task.Task; import net.minestom.server.coordinate.Point; import net.minestom.server.entity.Entity; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import unnamed.mmo.entity.brain.navigator.Navigator; -import unnamed.mmo.entity.brain.task.Task; public class SingleTaskBrain implements Brain { diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/CustomNavigator.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/CustomNavigator.java similarity index 86% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/CustomNavigator.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/CustomNavigator.java index 9a1b4e08..492b6093 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/CustomNavigator.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/CustomNavigator.java @@ -1,9 +1,9 @@ -package unnamed.mmo.entity.brain.navigator; +package net.hollowcube.entity.brain.navigator; import net.minestom.server.coordinate.Point; import net.minestom.server.entity.Entity; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.pathfinding.PFNavigator; +import net.hollowcube.entity.pathfinding.PFNavigator; final class CustomNavigator implements Navigator { private final PFNavigator navigator; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/HydrazineNavigator.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/HydrazineNavigator.java similarity index 87% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/HydrazineNavigator.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/HydrazineNavigator.java index ed8aa3c7..05a69cba 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/HydrazineNavigator.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/HydrazineNavigator.java @@ -1,12 +1,10 @@ -package unnamed.mmo.entity.brain.navigator; +package net.hollowcube.entity.brain.navigator; import com.extollit.gaming.ai.path.HydrazinePathFinder; import net.minestom.server.coordinate.Point; import net.minestom.server.entity.Entity; -import net.minestom.server.entity.pathfinding.NavigableEntity; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; final class HydrazineNavigator implements Navigator { private final net.minestom.server.entity.pathfinding.Navigator hydrazine; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/Navigator.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/Navigator.java similarity index 82% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/Navigator.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/Navigator.java index 4fe35168..9ee7618d 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/navigator/Navigator.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/navigator/Navigator.java @@ -1,13 +1,12 @@ -package unnamed.mmo.entity.brain.navigator; +package net.hollowcube.entity.brain.navigator; import net.minestom.server.coordinate.Point; import net.minestom.server.entity.Entity; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import unnamed.mmo.entity.brain.Brain; -import unnamed.mmo.entity.motion.MotionNavigator; -import unnamed.mmo.entity.motion.MotionNavigatorSlime; +import net.hollowcube.entity.motion.MotionNavigator; +import net.hollowcube.entity.motion.MotionNavigatorSlime; public interface Navigator { diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/stimuli/NearbyEntityStimuliSource.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/stimuli/NearbyEntityStimuliSource.java similarity index 88% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/stimuli/NearbyEntityStimuliSource.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/stimuli/NearbyEntityStimuliSource.java index e55b85bf..0113cd98 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/stimuli/NearbyEntityStimuliSource.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/stimuli/NearbyEntityStimuliSource.java @@ -1,12 +1,12 @@ -package unnamed.mmo.entity.brain.stimuli; +package net.hollowcube.entity.brain.stimuli; import net.minestom.server.entity.Entity; import net.minestom.server.entity.Player; import net.minestom.server.instance.EntityTracker; import net.minestom.server.instance.Instance; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; -import unnamed.mmo.entity.brain.SingleTaskBrain; +import net.hollowcube.entity.brain.Brain; +import net.hollowcube.entity.brain.SingleTaskBrain; import java.util.ArrayList; import java.util.List; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/stimuli/StimuliSource.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/stimuli/StimuliSource.java similarity index 58% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/stimuli/StimuliSource.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/stimuli/StimuliSource.java index cce5e8fa..7065da8c 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/stimuli/StimuliSource.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/stimuli/StimuliSource.java @@ -1,7 +1,7 @@ -package unnamed.mmo.entity.brain.stimuli; +package net.hollowcube.entity.brain.stimuli; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; +import net.hollowcube.entity.brain.Brain; public interface StimuliSource { diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/AbstractTask.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/AbstractTask.java similarity index 84% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/task/AbstractTask.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/task/AbstractTask.java index ad608f68..7c9748b6 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/AbstractTask.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/AbstractTask.java @@ -1,7 +1,7 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; +import net.hollowcube.entity.brain.Brain; public abstract non-sealed class AbstractTask implements Task { private State state = State.INIT; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/FollowTargetTask.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/FollowTargetTask.java similarity index 92% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/task/FollowTargetTask.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/task/FollowTargetTask.java index f7f590d5..b7163840 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/FollowTargetTask.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/FollowTargetTask.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import com.google.auto.service.AutoService; import com.mojang.serialization.Codec; @@ -6,8 +6,8 @@ import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.TimeUnit; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.UnnamedEntity; -import unnamed.mmo.entity.brain.Brain; +import net.hollowcube.entity.UnnamedEntity; +import net.hollowcube.entity.brain.Brain; import java.time.Duration; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/IdleTask.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/IdleTask.java similarity index 88% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/task/IdleTask.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/task/IdleTask.java index acbbc986..28f85f73 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/IdleTask.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/IdleTask.java @@ -1,12 +1,12 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import com.google.auto.service.AutoService; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.hollowcube.data.NumberSource; +import net.hollowcube.data.number.NumberProvider; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.data.NumberSource; -import unnamed.mmo.data.number.NumberProvider; -import unnamed.mmo.entity.brain.Brain; +import net.hollowcube.entity.brain.Brain; public class IdleTask extends AbstractTask { private final Spec spec; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/SelectorTask.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/SelectorTask.java similarity index 91% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/task/SelectorTask.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/task/SelectorTask.java index fa43fe98..11aafb76 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/SelectorTask.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/SelectorTask.java @@ -1,22 +1,22 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.hollowcube.entity.brain.stimuli.NearbyEntityStimuliSource; +import net.hollowcube.entity.brain.stimuli.StimuliSource; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import unnamed.mmo.entity.EntityMqlQueryContext; -import unnamed.mmo.entity.UnnamedEntity; -import unnamed.mmo.entity.brain.Brain; -import unnamed.mmo.entity.brain.stimuli.NearbyEntityStimuliSource; -import unnamed.mmo.entity.brain.stimuli.StimuliSource; -import unnamed.mmo.mql.MqlScript; +import net.hollowcube.entity.EntityMqlQueryContext; +import net.hollowcube.entity.UnnamedEntity; +import net.hollowcube.entity.brain.Brain; +import net.hollowcube.mql.MqlScript; import java.util.ArrayList; import java.util.List; -import static unnamed.mmo.util.ExtraCodecs.lazy; +import static net.hollowcube.dfu.ExtraCodecs.lazy; public class SelectorTask extends AbstractTask { private static final Logger LOGGER = LoggerFactory.getLogger(SelectorTask.class); diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/SequenceTask.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/SequenceTask.java similarity index 94% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/task/SequenceTask.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/task/SequenceTask.java index 99db0789..829c6a02 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/SequenceTask.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/SequenceTask.java @@ -1,14 +1,14 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import com.google.auto.service.AutoService; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; +import net.hollowcube.entity.brain.Brain; import java.util.List; -import static unnamed.mmo.util.ExtraCodecs.lazy; +import static net.hollowcube.dfu.ExtraCodecs.lazy; public class SequenceTask extends AbstractTask { diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/Task.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/Task.java similarity index 87% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/task/Task.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/task/Task.java index b9813d56..c305c7f4 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/Task.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/Task.java @@ -1,10 +1,10 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import com.mojang.serialization.Codec; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; -import unnamed.mmo.registry.Registry; -import unnamed.mmo.registry.ResourceFactory; +import net.hollowcube.entity.brain.Brain; +import net.hollowcube.registry.Registry; +import net.hollowcube.registry.ResourceFactory; public sealed interface Task permits AbstractTask { diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/WanderInRegionTask.java b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/WanderInRegionTask.java similarity index 94% rename from modules/entity/src/main/java/unnamed/mmo/entity/brain/task/WanderInRegionTask.java rename to modules/entity/src/main/java/net/hollowcube/entity/brain/task/WanderInRegionTask.java index 47dff860..7864707a 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/brain/task/WanderInRegionTask.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/brain/task/WanderInRegionTask.java @@ -1,10 +1,10 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import com.google.auto.service.AutoService; import com.mojang.serialization.Codec; import net.minestom.server.coordinate.Vec; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; +import net.hollowcube.entity.brain.Brain; import java.util.concurrent.ThreadLocalRandom; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/motion/MotionNavigator.java b/modules/entity/src/main/java/net/hollowcube/entity/motion/MotionNavigator.java similarity index 98% rename from modules/entity/src/main/java/unnamed/mmo/entity/motion/MotionNavigator.java rename to modules/entity/src/main/java/net/hollowcube/entity/motion/MotionNavigator.java index c23c3127..01980ad0 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/motion/MotionNavigator.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/motion/MotionNavigator.java @@ -1,11 +1,11 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; import com.mattworzala.debug.DebugMessage; import com.mattworzala.debug.Layer; import com.mattworzala.debug.shape.Box; import com.mattworzala.debug.shape.Line; import com.mattworzala.debug.shape.OutlineBox; -import net.minestom.server.MinecraftServer; +import net.hollowcube.entity.brain.navigator.Navigator; import net.minestom.server.attribute.Attribute; import net.minestom.server.collision.CollisionUtils; import net.minestom.server.coordinate.Point; @@ -24,7 +24,6 @@ import net.minestom.server.utils.time.TimeUnit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import unnamed.mmo.entity.brain.navigator.Navigator; import java.time.Duration; import java.util.ArrayList; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/motion/MotionNavigatorSlime.java b/modules/entity/src/main/java/net/hollowcube/entity/motion/MotionNavigatorSlime.java similarity index 96% rename from modules/entity/src/main/java/unnamed/mmo/entity/motion/MotionNavigatorSlime.java rename to modules/entity/src/main/java/net/hollowcube/entity/motion/MotionNavigatorSlime.java index 06dc0c08..9440ed78 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/motion/MotionNavigatorSlime.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/motion/MotionNavigatorSlime.java @@ -1,7 +1,7 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; +import net.hollowcube.entity.brain.navigator.Navigator; import net.minestom.server.attribute.Attribute; -import net.minestom.server.collision.CollisionUtils; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; @@ -9,12 +9,10 @@ import net.minestom.server.entity.LivingEntity; import net.minestom.server.instance.Chunk; import net.minestom.server.instance.Instance; -import net.minestom.server.utils.position.PositionUtils; import net.minestom.server.utils.time.Cooldown; import net.minestom.server.utils.time.TimeUnit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import unnamed.mmo.entity.brain.navigator.Navigator; import java.time.Duration; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/motion/Path.java b/modules/entity/src/main/java/net/hollowcube/entity/motion/Path.java similarity index 88% rename from modules/entity/src/main/java/unnamed/mmo/entity/motion/Path.java rename to modules/entity/src/main/java/net/hollowcube/entity/motion/Path.java index c041f476..7f5bfd01 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/motion/Path.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/motion/Path.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; import net.minestom.server.coordinate.Point; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/motion/PathGenerator.java b/modules/entity/src/main/java/net/hollowcube/entity/motion/PathGenerator.java similarity index 96% rename from modules/entity/src/main/java/unnamed/mmo/entity/motion/PathGenerator.java rename to modules/entity/src/main/java/net/hollowcube/entity/motion/PathGenerator.java index 3de173f2..6708de06 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/motion/PathGenerator.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/motion/PathGenerator.java @@ -1,12 +1,12 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; +import net.hollowcube.entity.motion.util.PhysicsUtil; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.block.Block; import net.minestom.server.utils.Direction; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.motion.util.PhysicsUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/motion/PathOptimizer.java b/modules/entity/src/main/java/net/hollowcube/entity/motion/PathOptimizer.java similarity index 90% rename from modules/entity/src/main/java/unnamed/mmo/entity/motion/PathOptimizer.java rename to modules/entity/src/main/java/net/hollowcube/entity/motion/PathOptimizer.java index ffb0bf5e..63fd7560 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/motion/PathOptimizer.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/motion/PathOptimizer.java @@ -1,11 +1,10 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; +import net.hollowcube.entity.motion.util.PhysicsUtil; import net.minestom.server.collision.BoundingBox; -import net.minestom.server.collision.CollisionUtils; import net.minestom.server.coordinate.Point; import net.minestom.server.instance.block.Block; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.motion.util.PhysicsUtil; import java.util.ArrayList; import java.util.List; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/motion/Pathfinder.java b/modules/entity/src/main/java/net/hollowcube/entity/motion/Pathfinder.java similarity index 98% rename from modules/entity/src/main/java/unnamed/mmo/entity/motion/Pathfinder.java rename to modules/entity/src/main/java/net/hollowcube/entity/motion/Pathfinder.java index 5915444e..cd25b2c5 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/motion/Pathfinder.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/motion/Pathfinder.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Point; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/motion/util/PhysicsUtil.java b/modules/entity/src/main/java/net/hollowcube/entity/motion/util/PhysicsUtil.java similarity index 99% rename from modules/entity/src/main/java/unnamed/mmo/entity/motion/util/PhysicsUtil.java rename to modules/entity/src/main/java/net/hollowcube/entity/motion/util/PhysicsUtil.java index a6365412..437880ab 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/motion/util/PhysicsUtil.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/motion/util/PhysicsUtil.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.motion.util; +package net.hollowcube.entity.motion.util; import net.minestom.server.collision.BoundingBox; import net.minestom.server.collision.CollisionUtils; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNavigator.java b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNavigator.java similarity index 99% rename from modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNavigator.java rename to modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNavigator.java index ec5b8447..86d404cd 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNavigator.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNavigator.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.pathfinding; +package net.hollowcube.entity.pathfinding; import com.mattworzala.debug.DebugMessage; import com.mattworzala.debug.Layer; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNeighborSupplier.java b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNeighborSupplier.java similarity index 98% rename from modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNeighborSupplier.java rename to modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNeighborSupplier.java index 00340323..4ab33591 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNeighborSupplier.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNeighborSupplier.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.pathfinding; +package net.hollowcube.entity.pathfinding; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Point; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNode.java b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNode.java similarity index 96% rename from modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNode.java rename to modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNode.java index d9cd2241..129fdba7 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFNode.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFNode.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.pathfinding; +package net.hollowcube.entity.pathfinding; import net.minestom.server.coordinate.Point; import net.minestom.server.instance.block.Block; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPath.java b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPath.java similarity index 95% rename from modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPath.java rename to modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPath.java index 9adc1cda..39820853 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPath.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPath.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.pathfinding; +package net.hollowcube.entity.pathfinding; import net.minestom.server.collision.BoundingBox; import net.minestom.server.collision.CollisionUtils; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPathGenerator.java b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPathGenerator.java similarity index 97% rename from modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPathGenerator.java rename to modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPathGenerator.java index c91b5d83..542b9d21 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPathGenerator.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPathGenerator.java @@ -1,8 +1,7 @@ -package unnamed.mmo.entity.pathfinding; +package net.hollowcube.entity.pathfinding; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Point; -import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.Instance; import java.util.*; diff --git a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPathOptimizer.java b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPathOptimizer.java similarity index 98% rename from modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPathOptimizer.java rename to modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPathOptimizer.java index 40196c29..ab5af9b4 100644 --- a/modules/entity/src/main/java/unnamed/mmo/entity/pathfinding/PFPathOptimizer.java +++ b/modules/entity/src/main/java/net/hollowcube/entity/pathfinding/PFPathOptimizer.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.pathfinding; +package net.hollowcube.entity.pathfinding; import net.minestom.server.collision.BoundingBox; import net.minestom.server.collision.CollisionUtils; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/MqlScript.java b/modules/entity/src/main/java/net/hollowcube/mql/MqlScript.java similarity index 79% rename from modules/entity/src/main/java/unnamed/mmo/mql/MqlScript.java rename to modules/entity/src/main/java/net/hollowcube/mql/MqlScript.java index b1e4b902..452ad168 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/MqlScript.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/MqlScript.java @@ -1,15 +1,15 @@ -package unnamed.mmo.mql; +package net.hollowcube.mql; import com.mojang.datafixers.util.Either; import com.mojang.serialization.Codec; +import net.hollowcube.dfu.DFUUtil; +import net.hollowcube.mql.parser.MqlParser; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlNumberValue; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.parser.MqlParser; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.tree.MqlExpr; -import unnamed.mmo.mql.tree.MqlNumberExpr; -import unnamed.mmo.mql.value.MqlNumberValue; -import unnamed.mmo.mql.value.MqlValue; -import unnamed.mmo.util.DFUUtil; +import net.hollowcube.mql.tree.MqlExpr; +import net.hollowcube.mql.tree.MqlNumberExpr; +import net.hollowcube.mql.value.MqlValue; public record MqlScript(@NotNull MqlExpr expr) { diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/README.md b/modules/entity/src/main/java/net/hollowcube/mql/README.md similarity index 100% rename from modules/entity/src/main/java/unnamed/mmo/mql/README.md rename to modules/entity/src/main/java/net/hollowcube/mql/README.md diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlLexer.java b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlLexer.java similarity index 98% rename from modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlLexer.java rename to modules/entity/src/main/java/net/hollowcube/mql/parser/MqlLexer.java index 22359a01..ea4a8bce 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlLexer.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlLexer.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.parser; +package net.hollowcube.mql.parser; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlParseError.java b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlParseError.java similarity index 84% rename from modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlParseError.java rename to modules/entity/src/main/java/net/hollowcube/mql/parser/MqlParseError.java index b4c1b286..7a74b5b0 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlParseError.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlParseError.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.parser; +package net.hollowcube.mql.parser; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlParser.java b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlParser.java similarity index 95% rename from modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlParser.java rename to modules/entity/src/main/java/net/hollowcube/mql/parser/MqlParser.java index 5fdf9b02..f8974727 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlParser.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlParser.java @@ -1,8 +1,9 @@ -package unnamed.mmo.mql.parser; +package net.hollowcube.mql.parser; +import net.hollowcube.mql.tree.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import unnamed.mmo.mql.tree.*; +import net.hollowcube.mql.tree.*; public class MqlParser { private final MqlLexer lexer; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlToken.java b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlToken.java similarity index 83% rename from modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlToken.java rename to modules/entity/src/main/java/net/hollowcube/mql/parser/MqlToken.java index 343a6fba..c2c99eb5 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/parser/MqlToken.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/parser/MqlToken.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.parser; +package net.hollowcube.mql.parser; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/runtime/MqlRuntimeError.java b/modules/entity/src/main/java/net/hollowcube/mql/runtime/MqlRuntimeError.java similarity index 83% rename from modules/entity/src/main/java/unnamed/mmo/mql/runtime/MqlRuntimeError.java rename to modules/entity/src/main/java/net/hollowcube/mql/runtime/MqlRuntimeError.java index 5eb023f9..f7f63e28 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/runtime/MqlRuntimeError.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/runtime/MqlRuntimeError.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.runtime; +package net.hollowcube.mql.runtime; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/runtime/MqlScope.java b/modules/entity/src/main/java/net/hollowcube/mql/runtime/MqlScope.java similarity index 67% rename from modules/entity/src/main/java/unnamed/mmo/mql/runtime/MqlScope.java rename to modules/entity/src/main/java/net/hollowcube/mql/runtime/MqlScope.java index 146c949f..564397d1 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/runtime/MqlScope.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/runtime/MqlScope.java @@ -1,7 +1,7 @@ -package unnamed.mmo.mql.runtime; +package net.hollowcube.mql.runtime; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.value.MqlValue; +import net.hollowcube.mql.value.MqlValue; public interface MqlScope { diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlAccessExpr.java b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlAccessExpr.java similarity index 74% rename from modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlAccessExpr.java rename to modules/entity/src/main/java/net/hollowcube/mql/tree/MqlAccessExpr.java index f868a3b1..9f7712e1 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlAccessExpr.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlAccessExpr.java @@ -1,9 +1,9 @@ -package unnamed.mmo.mql.tree; +package net.hollowcube.mql.tree; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlHolder; +import net.hollowcube.mql.value.MqlValue; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.value.MqlHolder; -import unnamed.mmo.mql.value.MqlValue; public record MqlAccessExpr( @NotNull MqlExpr lhs, diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlBinaryExpr.java b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlBinaryExpr.java similarity index 80% rename from modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlBinaryExpr.java rename to modules/entity/src/main/java/net/hollowcube/mql/tree/MqlBinaryExpr.java index c7e5ef79..7facdb8d 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlBinaryExpr.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlBinaryExpr.java @@ -1,9 +1,9 @@ -package unnamed.mmo.mql.tree; +package net.hollowcube.mql.tree; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlNumberValue; +import net.hollowcube.mql.value.MqlValue; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.value.MqlNumberValue; -import unnamed.mmo.mql.value.MqlValue; public record MqlBinaryExpr( @NotNull Op operator, diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlExpr.java b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlExpr.java similarity index 68% rename from modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlExpr.java rename to modules/entity/src/main/java/net/hollowcube/mql/tree/MqlExpr.java index ce2b40e8..4427cd12 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlExpr.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlExpr.java @@ -1,8 +1,8 @@ -package unnamed.mmo.mql.tree; +package net.hollowcube.mql.tree; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlValue; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.value.MqlValue; public sealed interface MqlExpr permits MqlAccessExpr, MqlBinaryExpr, MqlNumberExpr, MqlIdentExpr { diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlIdentExpr.java b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlIdentExpr.java similarity index 70% rename from modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlIdentExpr.java rename to modules/entity/src/main/java/net/hollowcube/mql/tree/MqlIdentExpr.java index d28da062..7aa668fe 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlIdentExpr.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlIdentExpr.java @@ -1,9 +1,8 @@ -package unnamed.mmo.mql.tree; +package net.hollowcube.mql.tree; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlValue; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.value.MqlIdentValue; -import unnamed.mmo.mql.value.MqlValue; public record MqlIdentExpr(@NotNull String value) implements MqlExpr { diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlNumberExpr.java b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlNumberExpr.java similarity index 73% rename from modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlNumberExpr.java rename to modules/entity/src/main/java/net/hollowcube/mql/tree/MqlNumberExpr.java index 05b0ab8f..73dd847d 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlNumberExpr.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlNumberExpr.java @@ -1,9 +1,9 @@ -package unnamed.mmo.mql.tree; +package net.hollowcube.mql.tree; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlNumberValue; +import net.hollowcube.mql.value.MqlValue; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.value.MqlNumberValue; -import unnamed.mmo.mql.value.MqlValue; public record MqlNumberExpr(@NotNull MqlNumberValue value) implements MqlExpr { diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlPrinter.java b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlPrinter.java similarity index 96% rename from modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlPrinter.java rename to modules/entity/src/main/java/net/hollowcube/mql/tree/MqlPrinter.java index 6b99dbb0..5cb42b6d 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlPrinter.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlPrinter.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.tree; +package net.hollowcube.mql.tree; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlVisitor.java b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlVisitor.java similarity index 94% rename from modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlVisitor.java rename to modules/entity/src/main/java/net/hollowcube/mql/tree/MqlVisitor.java index 625b44ae..4e14a246 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/tree/MqlVisitor.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/tree/MqlVisitor.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.tree; +package net.hollowcube.mql.tree; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlCallable.java b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlCallable.java similarity index 86% rename from modules/entity/src/main/java/unnamed/mmo/mql/value/MqlCallable.java rename to modules/entity/src/main/java/net/hollowcube/mql/value/MqlCallable.java index b9552271..4fffd1c8 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlCallable.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlCallable.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.value; +package net.hollowcube.mql.value; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlHolder.java b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlHolder.java similarity index 81% rename from modules/entity/src/main/java/unnamed/mmo/mql/value/MqlHolder.java rename to modules/entity/src/main/java/net/hollowcube/mql/value/MqlHolder.java index b1e35aae..356fc7f0 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlHolder.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlHolder.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.value; +package net.hollowcube.mql.value; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlIdentValue.java b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlIdentValue.java similarity index 84% rename from modules/entity/src/main/java/unnamed/mmo/mql/value/MqlIdentValue.java rename to modules/entity/src/main/java/net/hollowcube/mql/value/MqlIdentValue.java index 9c2bb4b8..6cf892ee 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlIdentValue.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlIdentValue.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.value; +package net.hollowcube.mql.value; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlNull.java b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlNull.java similarity index 79% rename from modules/entity/src/main/java/unnamed/mmo/mql/value/MqlNull.java rename to modules/entity/src/main/java/net/hollowcube/mql/value/MqlNull.java index 150e8e62..4708183a 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlNull.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlNull.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.value; +package net.hollowcube.mql.value; final class MqlNull implements MqlValue { public static final MqlNull INSTANCE = new MqlNull(); diff --git a/modules/entity/src/main/java/net/hollowcube/mql/value/MqlNumberValue.java b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlNumberValue.java new file mode 100644 index 00000000..d0e499af --- /dev/null +++ b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlNumberValue.java @@ -0,0 +1,9 @@ +package net.hollowcube.mql.value; + +public record MqlNumberValue(double value) implements MqlValue { + + @Override + public String toString() { + return String.valueOf(value); + } +} diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlValue.java b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlValue.java similarity index 89% rename from modules/entity/src/main/java/unnamed/mmo/mql/value/MqlValue.java rename to modules/entity/src/main/java/net/hollowcube/mql/value/MqlValue.java index f4eb7c8f..85aba481 100644 --- a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlValue.java +++ b/modules/entity/src/main/java/net/hollowcube/mql/value/MqlValue.java @@ -1,7 +1,7 @@ -package unnamed.mmo.mql.value; +package net.hollowcube.mql.value; +import net.hollowcube.mql.runtime.MqlRuntimeError; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.mql.runtime.MqlRuntimeError; /** * Mutable marker for any possible mql value. diff --git a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlNumberValue.java b/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlNumberValue.java deleted file mode 100644 index 3b8d1dfc..00000000 --- a/modules/entity/src/main/java/unnamed/mmo/mql/value/MqlNumberValue.java +++ /dev/null @@ -1,4 +0,0 @@ -package unnamed.mmo.mql.value; - -public record MqlNumberValue(double value) implements MqlValue { -} diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/navigator/TestNavigatorBasicIntegration.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/navigator/TestNavigatorBasicIntegration.java similarity index 92% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/navigator/TestNavigatorBasicIntegration.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/navigator/TestNavigatorBasicIntegration.java index ccdaf171..09dd2a9a 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/navigator/TestNavigatorBasicIntegration.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/navigator/TestNavigatorBasicIntegration.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.brain.navigator; +package net.hollowcube.entity.brain.navigator; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; @@ -19,7 +19,7 @@ public class TestNavigatorBasicIntegration { @ParameterizedTest(name = "{0}") - @MethodSource("unnamed.mmo.entity.brain.navigator.TestUtil#navigators") + @MethodSource("net.hollowcube.entity.brain.navigator.TestUtil#navigators") public void testBasicMovement(String name, Function newNavigator, Env env) { var entity = new Entity(EntityType.ZOMBIE); var navigator = newNavigator.apply(entity); @@ -42,7 +42,7 @@ public void testBasicMovement(String name, Function newNaviga } @ParameterizedTest(name = "{0}") - @MethodSource("unnamed.mmo.entity.brain.navigator.TestUtil#navigators") + @MethodSource("net.hollowcube.entity.brain.navigator.TestUtil#navigators") public void testBasicMovementAroundBlock(String name, Function newNavigator, Env env) { var entity = new Entity(EntityType.ZOMBIE); var navigator = newNavigator.apply(entity); diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/navigator/TestUtil.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/navigator/TestUtil.java similarity index 85% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/navigator/TestUtil.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/navigator/TestUtil.java index 4256618c..eae727a2 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/navigator/TestUtil.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/navigator/TestUtil.java @@ -1,8 +1,8 @@ -package unnamed.mmo.entity.brain.navigator; +package net.hollowcube.entity.brain.navigator; import net.minestom.server.entity.Entity; import org.junit.jupiter.params.provider.Arguments; -import unnamed.mmo.entity.motion.MotionNavigator; +import net.hollowcube.entity.motion.MotionNavigator; import java.util.function.Function; import java.util.stream.Stream; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestFollowTargetTaskIntegration.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestFollowTargetTaskIntegration.java similarity index 87% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestFollowTargetTaskIntegration.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestFollowTargetTaskIntegration.java index 1492bbd4..dfc72d2c 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestFollowTargetTaskIntegration.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestFollowTargetTaskIntegration.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; import net.minestom.server.test.Env; import net.minestom.server.test.EnvTest; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestIdleTask.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestIdleTask.java similarity index 82% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestIdleTask.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestIdleTask.java index 2ce88baa..480bed79 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestIdleTask.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestIdleTask.java @@ -1,8 +1,8 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; +import net.hollowcube.data.number.NumberProvider; +import net.hollowcube.entity.brain.task.test.MockBrain; import org.junit.jupiter.api.Test; -import unnamed.mmo.data.number.NumberProvider; -import unnamed.mmo.entity.brain.task.test.MockBrain; import static com.google.common.truth.Truth.assertThat; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestSequenceTask.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestSequenceTask.java similarity index 75% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestSequenceTask.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestSequenceTask.java index 7f5504b4..e8ecca9d 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/TestSequenceTask.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/TestSequenceTask.java @@ -1,13 +1,13 @@ -package unnamed.mmo.entity.brain.task; +package net.hollowcube.entity.brain.task; +import net.hollowcube.entity.brain.task.test.MockBrain; +import net.hollowcube.entity.brain.task.test.MockTask; +import net.hollowcube.entity.brain.task.test.TaskSubject; import org.junit.jupiter.api.Test; -import unnamed.mmo.entity.brain.task.test.MockBrain; -import unnamed.mmo.entity.brain.task.test.MockTask; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; -import static unnamed.mmo.entity.brain.task.test.TaskSubject.assertThat; public class TestSequenceTask { @Test @@ -34,8 +34,8 @@ public void testSingleTaskSuccess() { task.tick(brain, System.currentTimeMillis()); // Should have passed and mock1 should also have been run (passed) - assertThat(mock1).isComplete(); - assertThat(task).isComplete(); + TaskSubject.assertThat(mock1).isComplete(); + TaskSubject.assertThat(task).isComplete(); } @Test @@ -48,11 +48,11 @@ public void testMultiTaskSuccess() { task.start(brain); task.tick(brain, System.currentTimeMillis()); - assertThat(mock1).isComplete(); + TaskSubject.assertThat(mock1).isComplete(); task.tick(brain, System.currentTimeMillis()); - assertThat(mock2).isComplete(); + TaskSubject.assertThat(mock2).isComplete(); - assertThat(task).isComplete(); + TaskSubject.assertThat(task).isComplete(); } } diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/MockBrain.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/MockBrain.java similarity index 77% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/MockBrain.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/MockBrain.java index 212864f8..0e03dd27 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/MockBrain.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/MockBrain.java @@ -1,10 +1,10 @@ -package unnamed.mmo.entity.brain.task.test; +package net.hollowcube.entity.brain.task.test; +import net.hollowcube.entity.brain.navigator.Navigator; import net.minestom.server.coordinate.Point; import net.minestom.server.entity.Entity; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; -import unnamed.mmo.entity.brain.navigator.Navigator; +import net.hollowcube.entity.brain.Brain; public class MockBrain implements Brain { diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/MockTask.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/MockTask.java similarity index 69% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/MockTask.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/MockTask.java index e13b2151..2e636e0e 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/MockTask.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/MockTask.java @@ -1,9 +1,8 @@ -package unnamed.mmo.entity.brain.task.test; +package net.hollowcube.entity.brain.task.test; +import net.hollowcube.entity.brain.task.AbstractTask; import org.jetbrains.annotations.NotNull; -import unnamed.mmo.entity.brain.Brain; -import unnamed.mmo.entity.brain.task.AbstractTask; -import unnamed.mmo.entity.brain.task.Task; +import net.hollowcube.entity.brain.Brain; public class MockTask extends AbstractTask { private final Boolean pass; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/TaskSubject.java b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/TaskSubject.java similarity index 90% rename from modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/TaskSubject.java rename to modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/TaskSubject.java index bb275ddc..5efa8c32 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/brain/task/test/TaskSubject.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/brain/task/test/TaskSubject.java @@ -1,12 +1,12 @@ -package unnamed.mmo.entity.brain.task.test; +package net.hollowcube.entity.brain.task.test; import com.google.common.truth.Fact; import com.google.common.truth.FailureMetadata; import com.google.common.truth.Subject; import com.google.common.truth.Truth; +import net.hollowcube.entity.brain.task.Task; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import unnamed.mmo.entity.brain.task.Task; public class TaskSubject extends Subject { private final Task actual; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathGeneratorLand.java b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathGeneratorLand.java similarity index 97% rename from modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathGeneratorLand.java rename to modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathGeneratorLand.java index 673ffe5b..704e1d4b 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathGeneratorLand.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathGeneratorLand.java @@ -1,10 +1,10 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.block.Block; import org.junit.jupiter.api.Test; -import unnamed.mmo.test.MockBlockGetter; +import net.hollowcube.test.MockBlockGetter; import static com.google.common.truth.Truth.assertThat; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathGeneratorWater.java b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathGeneratorWater.java similarity index 96% rename from modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathGeneratorWater.java rename to modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathGeneratorWater.java index f48159a8..619aedb1 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathGeneratorWater.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathGeneratorWater.java @@ -1,10 +1,10 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.block.Block; import org.junit.jupiter.api.Test; -import unnamed.mmo.test.MockBlockGetter; +import net.hollowcube.test.MockBlockGetter; import static com.google.common.truth.Truth.assertThat; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathOptimizerStringPull.java b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathOptimizerStringPull.java similarity index 97% rename from modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathOptimizerStringPull.java rename to modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathOptimizerStringPull.java index 5ad45ba5..88e78d14 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathOptimizerStringPull.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathOptimizerStringPull.java @@ -1,10 +1,10 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Vec; import net.minestom.server.instance.block.Block; import org.junit.jupiter.api.Test; -import unnamed.mmo.test.MockBlockGetter; +import net.hollowcube.test.MockBlockGetter; import java.util.List; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathfinderAStar.java b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathfinderAStar.java similarity index 96% rename from modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathfinderAStar.java rename to modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathfinderAStar.java index ff0e865e..9763cb53 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/motion/TestPathfinderAStar.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/motion/TestPathfinderAStar.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.motion; +package net.hollowcube.entity.motion; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Point; @@ -6,7 +6,7 @@ import net.minestom.server.instance.block.Block; import net.minestom.server.utils.Direction; import org.junit.jupiter.api.Test; -import unnamed.mmo.test.MockBlockGetter; +import net.hollowcube.test.MockBlockGetter; import java.util.ArrayList; import java.util.List; diff --git a/modules/entity/src/test/java/unnamed/mmo/entity/motion/util/TestPhysicsUtil.java b/modules/entity/src/test/java/net/hollowcube/entity/motion/util/TestPhysicsUtil.java similarity index 97% rename from modules/entity/src/test/java/unnamed/mmo/entity/motion/util/TestPhysicsUtil.java rename to modules/entity/src/test/java/net/hollowcube/entity/motion/util/TestPhysicsUtil.java index 4f1cb15a..bae0680f 100644 --- a/modules/entity/src/test/java/unnamed/mmo/entity/motion/util/TestPhysicsUtil.java +++ b/modules/entity/src/test/java/net/hollowcube/entity/motion/util/TestPhysicsUtil.java @@ -1,4 +1,4 @@ -package unnamed.mmo.entity.motion.util; +package net.hollowcube.entity.motion.util; import net.minestom.server.collision.BoundingBox; import net.minestom.server.coordinate.Point; @@ -8,7 +8,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import unnamed.mmo.test.MockBlockGetter; +import net.hollowcube.test.MockBlockGetter; import java.util.stream.Stream; diff --git a/modules/entity/src/test/java/unnamed/mmo/mql/MqlTest.java b/modules/entity/src/test/java/net/hollowcube/mql/MqlTest.java similarity index 78% rename from modules/entity/src/test/java/unnamed/mmo/mql/MqlTest.java rename to modules/entity/src/test/java/net/hollowcube/mql/MqlTest.java index 372be604..0e96dd7c 100644 --- a/modules/entity/src/test/java/unnamed/mmo/mql/MqlTest.java +++ b/modules/entity/src/test/java/net/hollowcube/mql/MqlTest.java @@ -1,13 +1,13 @@ -package unnamed.mmo.mql; +package net.hollowcube.mql; +import net.hollowcube.mql.parser.MqlParser; +import net.hollowcube.mql.runtime.MqlRuntimeError; +import net.hollowcube.mql.runtime.MqlScope; +import net.hollowcube.mql.value.MqlHolder; +import net.hollowcube.mql.value.MqlNumberValue; +import net.hollowcube.mql.value.MqlValue; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; -import unnamed.mmo.mql.parser.MqlParser; -import unnamed.mmo.mql.runtime.MqlRuntimeError; -import unnamed.mmo.mql.runtime.MqlScope; -import unnamed.mmo.mql.value.MqlHolder; -import unnamed.mmo.mql.value.MqlNumberValue; -import unnamed.mmo.mql.value.MqlValue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/modules/entity/src/test/java/unnamed/mmo/mql/parser/TestMqlLexer.java b/modules/entity/src/test/java/net/hollowcube/mql/parser/TestMqlLexer.java similarity index 97% rename from modules/entity/src/test/java/unnamed/mmo/mql/parser/TestMqlLexer.java rename to modules/entity/src/test/java/net/hollowcube/mql/parser/TestMqlLexer.java index c53d151b..0962039c 100644 --- a/modules/entity/src/test/java/unnamed/mmo/mql/parser/TestMqlLexer.java +++ b/modules/entity/src/test/java/net/hollowcube/mql/parser/TestMqlLexer.java @@ -1,4 +1,4 @@ -package unnamed.mmo.mql.parser; +package net.hollowcube.mql.parser; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/modules/entity/src/test/java/unnamed/mmo/mql/parser/TestMqlParser.java b/modules/entity/src/test/java/net/hollowcube/mql/parser/TestMqlParser.java similarity index 94% rename from modules/entity/src/test/java/unnamed/mmo/mql/parser/TestMqlParser.java rename to modules/entity/src/test/java/net/hollowcube/mql/parser/TestMqlParser.java index baffb99a..65cbeeaf 100644 --- a/modules/entity/src/test/java/unnamed/mmo/mql/parser/TestMqlParser.java +++ b/modules/entity/src/test/java/net/hollowcube/mql/parser/TestMqlParser.java @@ -1,9 +1,9 @@ -package unnamed.mmo.mql.parser; +package net.hollowcube.mql.parser; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import unnamed.mmo.mql.tree.MqlPrinter; +import net.hollowcube.mql.tree.MqlPrinter; import java.util.stream.Stream; diff --git a/modules/entity/src/test/java/unnamed/mmo/test/MockBlockGetter.java b/modules/entity/src/test/java/net/hollowcube/test/MockBlockGetter.java similarity index 98% rename from modules/entity/src/test/java/unnamed/mmo/test/MockBlockGetter.java rename to modules/entity/src/test/java/net/hollowcube/test/MockBlockGetter.java index 17c1787a..04d10088 100644 --- a/modules/entity/src/test/java/unnamed/mmo/test/MockBlockGetter.java +++ b/modules/entity/src/test/java/net/hollowcube/test/MockBlockGetter.java @@ -1,4 +1,4 @@ -package unnamed.mmo.test; +package net.hollowcube.test; import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Vec;