refactor: merge las and ligthandshadow pkgs into lightandshadow pkg (#…

…245)

This does a rather coarse grained re-ordering of the files and simply aims to merge the two legacy packages by moving the files into the following structure:

```
org.terasology.module
  |_ lightandshadow| 
    |_ components
    |_ components
 |_ components
```

components
    events
    systems
    ui
    world

src/main/java/org/terasology/ligthandshadow/componentsystem/LASUtils.java → src/main/java/org/terasology/lightandshadow/LASUtils.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem;
+package org.terasology.lightandshadow;
 
 import org.joml.Vector3f;
 import org.joml.Vector3fc;

src/main/java/org/terasology/ligthandshadow/componentsystem/input/TapButton.java → src/main/java/org/terasology/lightandshadow/TapButton.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.input;
+package org.terasology.lightandshadow;
 
 import org.terasology.engine.input.BindButtonEvent;
 import org.terasology.engine.input.DefaultBinding;

src/main/java/org/terasology/ligthandshadow/componentsystem/components/FlagDropOnActivateComponent.java → src/main/java/org/terasology/lightandshadow/components/FlagDropOnActivateComponent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.components;
+package org.terasology.lightandshadow.components;
 
 import org.terasology.gestalt.entitysystem.component.EmptyComponent;
 

src/main/java/org/terasology/ligthandshadow/componentsystem/components/FlagParticleComponent.java → src/main/java/org/terasology/lightandshadow/components/FlagParticleComponent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.components;
+package org.terasology.lightandshadow.components;
 
 import org.terasology.gestalt.entitysystem.component.Component;
 import org.terasology.engine.entitySystem.entity.EntityRef;

src/main/java/org/terasology/ligthandshadow/componentsystem/components/HasFlagComponent.java → src/main/java/org/terasology/lightandshadow/components/HasFlagComponent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.components;
+package org.terasology.lightandshadow.components;
 
 import org.terasology.gestalt.entitysystem.component.EmptyComponent;
 

src/main/java/org/terasology/ligthandshadow/componentsystem/components/InvulnerableComponent.java → src/main/java/org/terasology/lightandshadow/components/InvulnerableComponent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.components;
+package org.terasology.lightandshadow.components;
 
 import org.terasology.gestalt.entitysystem.component.EmptyComponent;
 

src/main/java/org/terasology/ligthandshadow/componentsystem/components/LASConfigComponent.java → src/main/java/org/terasology/lightandshadow/components/LASConfigComponent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.components;
+package org.terasology.lightandshadow.components;
 
 import org.terasology.gestalt.entitysystem.component.Component;
 

src/main/java/org/terasology/ligthandshadow/barrier/MagicDome.java → src/main/java/org/terasology/lightandshadow/components/MagicDome.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.barrier;
+package org.terasology.lightandshadow.components;
 
 import org.terasology.engine.audio.StaticSound;
 import org.terasology.gestalt.entitysystem.component.Component;

src/main/java/org/terasology/ligthandshadow/componentsystem/components/PlayerStatisticsComponent.java → src/main/java/org/terasology/lightandshadow/components/PlayerStatisticsComponent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.components;
+package org.terasology.lightandshadow.components;
 
 import org.terasology.gestalt.entitysystem.component.Component;
 import org.terasology.engine.network.Replicate;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/ActivateBarrierEvent.java → src/main/java/org/terasology/lightandshadow/events/ActivateBarrierEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 

src/main/java/org/terasology/ligthandshadow/componentsystem/events/ClientRestartEvent.java → src/main/java/org/terasology/lightandshadow/events/ClientRestartEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/DelayedDeactivateBarrierEvent.java → src/main/java/org/terasology/lightandshadow/events/DelayedDeactivateBarrierEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/DropFlagEvent.java → src/main/java/org/terasology/lightandshadow/events/DropFlagEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/GameOverEvent.java → src/main/java/org/terasology/lightandshadow/events/GameOverEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/GameStartMessageEvent.java → src/main/java/org/terasology/lightandshadow/events/GameStartMessageEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/GiveFlagEvent.java → src/main/java/org/terasology/lightandshadow/events/GiveFlagEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/OnFlagDropEvent.java → src/main/java/org/terasology/lightandshadow/events/OnFlagDropEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/OnFlagPickupEvent.java → src/main/java/org/terasology/lightandshadow/events/OnFlagPickupEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/PregameEvent.java → src/main/java/org/terasology/lightandshadow/events/PregameEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 

src/main/java/org/terasology/ligthandshadow/componentsystem/events/RestartRequestEvent.java → src/main/java/org/terasology/lightandshadow/events/RestartRequestEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/ReturnFlagEvent.java → src/main/java/org/terasology/lightandshadow/events/ReturnFlagEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/ScoreUpdateFromServerEvent.java → src/main/java/org/terasology/lightandshadow/events/ScoreUpdateFromServerEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.BroadcastEvent;

src/main/java/org/terasology/ligthandshadow/componentsystem/events/TimerEvent.java → src/main/java/org/terasology/lightandshadow/events/TimerEvent.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.events;
+package org.terasology.lightandshadow.events;
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/AttackSystem.java → src/main/java/org/terasology/lightandshadow/systems/AttackSystem.java

@@ -1,7 +1,7 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
@@ -17,12 +17,12 @@
 import org.terasology.engine.registry.In;
 import org.terasology.lightandshadowresources.components.FlagComponent;
 import org.terasology.lightandshadowresources.components.LASTeamComponent;
-import org.terasology.ligthandshadow.componentsystem.components.FlagDropOnActivateComponent;
-import org.terasology.ligthandshadow.componentsystem.components.HasFlagComponent;
-import org.terasology.ligthandshadow.componentsystem.events.DropFlagEvent;
-import org.terasology.ligthandshadow.componentsystem.events.OnFlagDropEvent;
-import org.terasology.ligthandshadow.componentsystem.events.OnFlagPickupEvent;
-import org.terasology.ligthandshadow.componentsystem.events.ReturnFlagEvent;
+import org.terasology.lightandshadow.components.FlagDropOnActivateComponent;
+import org.terasology.lightandshadow.components.HasFlagComponent;
+import org.terasology.lightandshadow.events.DropFlagEvent;
+import org.terasology.lightandshadow.events.OnFlagDropEvent;
+import org.terasology.lightandshadow.events.OnFlagPickupEvent;
+import org.terasology.lightandshadow.events.ReturnFlagEvent;
 import org.terasology.module.inventory.events.InventorySlotChangedEvent;
 
 @RegisterSystem(RegisterMode.AUTHORITY)

src/main/java/org/terasology/ligthandshadow/logic/CardSystem.java → src/main/java/org/terasology/lightandshadow/systems/CardSystem.java

@@ -1,7 +1,7 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-package org.terasology.ligthandshadow.logic;
+package org.terasology.lightandshadow.systems;
 
 import org.joml.Vector3f;
 import org.joml.Vector3i;

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/ClientGameOverSystem.java → src/main/java/org/terasology/lightandshadow/systems/ClientGameOverSystem.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
@@ -16,10 +16,10 @@
 import org.terasology.engine.registry.Share;
 import org.terasology.engine.rendering.nui.NUIManager;
 import org.terasology.engine.rendering.nui.layers.ingame.DeathScreen;
-import org.terasology.ligthandshadow.componentsystem.LASUtils;
-import org.terasology.ligthandshadow.componentsystem.components.PlayerStatisticsComponent;
-import org.terasology.ligthandshadow.componentsystem.events.GameOverEvent;
-import org.terasology.ligthandshadow.componentsystem.events.RestartRequestEvent;
+import org.terasology.lightandshadow.LASUtils;
+import org.terasology.lightandshadow.components.PlayerStatisticsComponent;
+import org.terasology.lightandshadow.events.GameOverEvent;
+import org.terasology.lightandshadow.events.RestartRequestEvent;
 import org.terasology.lightandshadowresources.components.LASTeamComponent;
 import org.terasology.nui.WidgetUtil;
 import org.terasology.nui.layouts.miglayout.MigLayout;

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/ClientParticleSystem.java → src/main/java/org/terasology/lightandshadow/systems/ClientParticleSystem.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.joml.Vector3f;
 import org.terasology.engine.entitySystem.entity.EntityManager;
@@ -12,10 +12,10 @@
 import org.terasology.engine.logic.location.Location;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.registry.In;
-import org.terasology.ligthandshadow.componentsystem.LASUtils;
-import org.terasology.ligthandshadow.componentsystem.components.FlagParticleComponent;
-import org.terasology.ligthandshadow.componentsystem.events.OnFlagDropEvent;
-import org.terasology.ligthandshadow.componentsystem.events.OnFlagPickupEvent;
+import org.terasology.lightandshadow.LASUtils;
+import org.terasology.lightandshadow.components.FlagParticleComponent;
+import org.terasology.lightandshadow.events.OnFlagDropEvent;
+import org.terasology.lightandshadow.events.OnFlagPickupEvent;
 
 @RegisterSystem(RegisterMode.CLIENT)
 public class ClientParticleSystem extends BaseComponentSystem {
@@ -26,7 +26,7 @@ public class ClientParticleSystem extends BaseComponentSystem {
      * Attaches a particle emitter to the player when the player picks up a flag.
      * Emitted particles are based on the flag's team.
      * @see OnFlagPickupEvent
-     * @see org.terasology.ligthandshadow.componentsystem.controllers.AttackSystem
+     * @see AttackSystem
      *
      * @param event
      * @param entity
@@ -51,7 +51,7 @@ public void onFlagPickup(OnFlagPickupEvent event, EntityRef entity) {
     /**
      * Removes the particle emitter from the player when the player drops the flag.
      * @see OnFlagDropEvent
-     * @see org.terasology.ligthandshadow.componentsystem.controllers.AttackSystem
+     * @see AttackSystem
      *
      * @param event
      * @param entity

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/ClientPregameSystem.java → src/main/java/org/terasology/lightandshadow/systems/ClientPregameSystem.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
@@ -12,8 +12,8 @@
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
 import org.terasology.gestalt.assets.ResourceUrn;
-import org.terasology.ligthandshadow.componentsystem.events.GameStartMessageEvent;
-import org.terasology.ligthandshadow.componentsystem.events.TimerEvent;
+import org.terasology.lightandshadow.events.GameStartMessageEvent;
+import org.terasology.lightandshadow.events.TimerEvent;
 import org.terasology.notify.ui.DialogNotificationOverlay;
 
 import java.util.Timer;

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/ClientRestartSystem.java → src/main/java/org/terasology/lightandshadow/systems/ClientRestartSystem.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
@@ -11,8 +11,8 @@
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
 import org.terasology.engine.rendering.nui.layers.ingame.DeathScreen;
-import org.terasology.ligthandshadow.componentsystem.LASUtils;
-import org.terasology.ligthandshadow.componentsystem.events.ClientRestartEvent;
+import org.terasology.lightandshadow.LASUtils;
+import org.terasology.lightandshadow.events.ClientRestartEvent;
 import org.terasology.nui.UILayout;
 
 /**

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/ClientScoreSystem.java → src/main/java/org/terasology/lightandshadow/systems/ClientScoreSystem.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
@@ -9,8 +9,8 @@
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
-import org.terasology.ligthandshadow.componentsystem.LASUtils;
-import org.terasology.ligthandshadow.componentsystem.events.ScoreUpdateFromServerEvent;
+import org.terasology.lightandshadow.LASUtils;
+import org.terasology.lightandshadow.events.ScoreUpdateFromServerEvent;
 import org.terasology.nui.ControlWidget;
 import org.terasology.nui.databinding.ReadOnlyBinding;
 import org.terasology.nui.widgets.UILabel;

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/ClientSkinSystem.java → src/main/java/org/terasology/lightandshadow/systems/ClientSkinSystem.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.core.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent;
@@ -19,7 +19,7 @@
 import org.terasology.engine.rendering.logic.SkeletalMeshComponent;
 import org.terasology.engine.rendering.nui.NUIManager;
 import org.terasology.engine.utilities.Assets;
-import org.terasology.ligthandshadow.componentsystem.LASUtils;
+import org.terasology.lightandshadow.LASUtils;
 import org.terasology.lightandshadowresources.components.LASTeamComponent;
 import org.terasology.nui.widgets.UIIconBar;
 import org.terasology.module.health.ui.HealthHud;

src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/ClientStatisticsSystem.java → src/main/java/org/terasology/lightandshadow/systems/ClientStatisticsSystem.java

@@ -1,6 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-package org.terasology.ligthandshadow.componentsystem.controllers;
+package org.terasology.lightandshadow.systems;
 
 import org.terasology.engine.core.SimpleUri;
 import org.terasology.engine.entitySystem.entity.EntityRef;
@@ -17,9 +17,9 @@
 import org.terasology.engine.rendering.nui.layers.ingame.DeathScreen;
 import org.terasology.engine.unicode.EnclosedAlphanumerics;
 import org.terasology.input.Input;
-import org.terasology.ligthandshadow.componentsystem.LASUtils;
-import org.terasology.ligthandshadow.componentsystem.events.ScoreUpdateFromServerEvent;
-import org.terasology.ligthandshadow.componentsystem.input.TapButton;
+import org.terasology.lightandshadow.LASUtils;
+import org.terasology.lightandshadow.events.ScoreUpdateFromServerEvent;
+import org.terasology.lightandshadow.TapButton;
 import org.terasology.notifications.events.ExpireNotificationEvent;
 import org.terasology.notifications.events.ShowNotificationEvent;
 import org.terasology.notifications.model.Notification;