Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: merge las and ligthandshadow pkgs into lightandshadow pkg #245

Merged
merged 1 commit into from
Nov 12, 2021
Merged

refactor: merge las and ligthandshadow pkgs into lightandshadow pkg #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...thandshadow/componentsystem/LASUtils.java → ...g/terasology/lightandshadow/LASUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...adow/componentsystem/input/TapButton.java → .../terasology/lightandshadow/TapButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mponents/FlagDropOnActivateComponent.java → ...mponents/FlagDropOnActivateComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...tem/components/FlagParticleComponent.java → ...dow/components/FlagParticleComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ntsystem/components/HasFlagComponent.java → ...ndshadow/components/HasFlagComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...tem/components/InvulnerableComponent.java → ...dow/components/InvulnerableComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...system/components/LASConfigComponent.java → ...shadow/components/LASConfigComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ogy/ligthandshadow/barrier/MagicDome.java → .../lightandshadow/components/MagicDome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...components/PlayerStatisticsComponent.java → ...components/PlayerStatisticsComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ntsystem/events/ActivateBarrierEvent.java → ...ndshadow/events/ActivateBarrierEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...nentsystem/events/ClientRestartEvent.java → ...tandshadow/events/ClientRestartEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...events/DelayedDeactivateBarrierEvent.java → ...events/DelayedDeactivateBarrierEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...componentsystem/events/DropFlagEvent.java → .../lightandshadow/events/DropFlagEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...componentsystem/events/GameOverEvent.java → .../lightandshadow/events/GameOverEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tsystem/events/GameStartMessageEvent.java → ...dshadow/events/GameStartMessageEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...componentsystem/events/GiveFlagEvent.java → .../lightandshadow/events/GiveFlagEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mponentsystem/events/OnFlagDropEvent.java → ...ightandshadow/events/OnFlagDropEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...onentsystem/events/OnFlagPickupEvent.java → ...htandshadow/events/OnFlagPickupEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../componentsystem/events/PregameEvent.java → ...y/lightandshadow/events/PregameEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...entsystem/events/RestartRequestEvent.java → ...andshadow/events/RestartRequestEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mponentsystem/events/ReturnFlagEvent.java → ...ightandshadow/events/ReturnFlagEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...em/events/ScoreUpdateFromServerEvent.java → ...ow/events/ScoreUpdateFromServerEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ow/componentsystem/events/TimerEvent.java → ...ogy/lightandshadow/events/TimerEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 7 additions & 7 deletions ...onentsystem/controllers/AttackSystem.java → .../lightandshadow/systems/AttackSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...logy/ligthandshadow/logic/CardSystem.java → ...gy/lightandshadow/systems/CardSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...tem/controllers/ClientGameOverSystem.java → ...dshadow/systems/ClientGameOverSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions ...tem/controllers/ClientParticleSystem.java → ...dshadow/systems/ClientParticleSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...stem/controllers/ClientPregameSystem.java → ...ndshadow/systems/ClientPregameSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...stem/controllers/ClientRestartSystem.java → ...ndshadow/systems/ClientRestartSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...system/controllers/ClientScoreSystem.java → ...tandshadow/systems/ClientScoreSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...tsystem/controllers/ClientSkinSystem.java → ...htandshadow/systems/ClientSkinSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...m/controllers/ClientStatisticsSystem.java → ...hadow/systems/ClientStatisticsSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Loading