refactor: move module off engine path MovingBlocks/Terasology#4580

Terasology · Mar 17, 2021 · 6afbc53 · 6afbc53
2 parents 31cc4b5 + be93ec4
commit 6afbc53
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/org/terasology/equipment/system/EquipmentEffectsSystem.java b/src/main/java/org/terasology/equipment/system/EquipmentEffectsSystem.java
@@ -41,7 +41,7 @@
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.engine.logic.health.event.BeforeDamagedEvent;
+import org.terasology.logic.health.event.BeforeDamagedEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.equipment.component.EquipmentComponent;
 import org.terasology.equipment.component.EquipmentEffectComponent;

diff --git a/src/main/java/org/terasology/equipment/system/EquipmentSystem.java b/src/main/java/org/terasology/equipment/system/EquipmentSystem.java
@@ -12,20 +12,20 @@
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.common.DisplayNameComponent;
 import org.terasology.engine.logic.health.DoDestroyEvent;
-import org.terasology.engine.logic.health.event.BeforeDamagedEvent;
-import org.terasology.engine.logic.inventory.InventoryComponent;
-import org.terasology.engine.logic.inventory.InventoryManager;
-import org.terasology.engine.logic.inventory.InventoryUtils;
-import org.terasology.engine.logic.inventory.events.BeforeItemPutInInventory;
-import org.terasology.engine.logic.inventory.events.BeforeItemRemovedFromInventory;
-import org.terasology.engine.logic.inventory.events.DropItemRequest;
+import org.terasology.logic.health.event.BeforeDamagedEvent;
+import org.terasology.module.inventory.components.InventoryComponent;
+import org.terasology.module.inventory.systems.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryUtils;
+import org.terasology.module.inventory.events.BeforeItemPutInInventory;
+import org.terasology.module.inventory.events.BeforeItemRemovedFromInventory;
+import org.terasology.module.inventory.events.DropItemRequest;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
-import org.terasology.engine.rendering.nui.layers.ingame.inventory.GetItemTooltip;
+import org.terasology.module.inventory.ui.GetItemTooltip;
 import org.terasology.engine.utilities.Assets;
 import org.terasology.equipment.component.EquipmentComponent;
 import org.terasology.equipment.component.EquipmentInventoryComponent;

diff --git a/src/main/java/org/terasology/equipment/ui/CharacterScreenWindow.java b/src/main/java/org/terasology/equipment/ui/CharacterScreenWindow.java
@@ -6,12 +6,12 @@
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.common.DisplayNameComponent;
-import org.terasology.engine.logic.inventory.InventoryComponent;
+import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.BaseInteractionScreen;
-import org.terasology.engine.rendering.nui.layers.ingame.inventory.InventoryGrid;
+import org.terasology.module.inventory.ui.InventoryGrid;
 import org.terasology.equipment.component.EquipmentComponent;
 import org.terasology.equipment.component.EquipmentItemComponent;
 import org.terasology.equipment.component.EquipmentSlot;