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

Terasology · Mar 17, 2021 · ca283bf · ca283bf
2 parents a030546 + ee94689
commit ca283bf
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/org/terasology/workstation/process/WorkstationInventoryUtils.java b/src/main/java/org/terasology/workstation/process/WorkstationInventoryUtils.java
@@ -17,7 +17,7 @@
 
 import com.google.common.collect.Lists;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.logic.inventory.InventoryAccessComponent;
+import org.terasology.module.inventory.components.InventoryAccessComponent;
 import org.terasology.workstation.component.WorkstationInventoryComponent;
 
 import java.util.Collections;

diff --git a/...g/terasology/workstation/process/fluid/FillFluidInventoryPartProcessPartCommonSystem.java b/...g/terasology/workstation/process/fluid/FillFluidInventoryPartProcessPartCommonSystem.java
@@ -20,8 +20,8 @@
 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.inventory.InventoryManager;
-import org.terasology.engine.logic.inventory.InventoryUtils;
+import org.terasology.module.inventory.systems.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryUtils;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.registry.In;
 import org.terasology.fluid.component.FluidComponent;

diff --git a/...a/org/terasology/workstation/process/inventory/InventoryInputProcessPartCommonSystem.java b/...a/org/terasology/workstation/process/inventory/InventoryInputProcessPartCommonSystem.java
@@ -26,8 +26,8 @@
 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.inventory.InventoryManager;
-import org.terasology.engine.logic.inventory.InventoryUtils;
+import org.terasology.module.inventory.systems.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryUtils;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.utilities.Assets;

diff --git a/.../org/terasology/workstation/process/inventory/InventoryOutputProcessPartCommonSystem.java b/.../org/terasology/workstation/process/inventory/InventoryOutputProcessPartCommonSystem.java
@@ -23,7 +23,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.inventory.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.block.BlockManager;
 import org.terasology.workstation.process.WorkstationInventoryUtils;

diff --git a/src/main/java/org/terasology/workstation/process/inventory/InventoryProcessPartUtils.java b/src/main/java/org/terasology/workstation/process/inventory/InventoryProcessPartUtils.java
@@ -22,7 +22,7 @@
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.logic.common.DisplayNameComponent;
-import org.terasology.engine.logic.inventory.InventoryUtils;
+import org.terasology.module.inventory.systems.InventoryUtils;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.world.block.BlockManager;
 import org.terasology.engine.world.block.family.BlockFamily;

diff --git a/src/main/java/org/terasology/workstation/system/InventoryBasedAutomaticProcessingSystem.java b/src/main/java/org/terasology/workstation/system/InventoryBasedAutomaticProcessingSystem.java
@@ -21,8 +21,8 @@
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.engine.logic.inventory.events.InventorySlotChangedEvent;
-import org.terasology.engine.logic.inventory.events.InventorySlotStackSizeChangedEvent;
+import org.terasology.module.inventory.events.InventorySlotChangedEvent;
+import org.terasology.module.inventory.events.InventorySlotStackSizeChangedEvent;
 import org.terasology.fluid.component.FluidInventoryComponent;
 import org.terasology.workstation.component.WorkstationComponent;
 import org.terasology.workstation.event.WorkstationStateChanged;

diff --git a/src/main/java/org/terasology/workstation/system/WorkstationInventoryValidationSystem.java b/src/main/java/org/terasology/workstation/system/WorkstationInventoryValidationSystem.java
@@ -19,9 +19,9 @@
 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.inventory.InventoryComponent;
-import org.terasology.engine.logic.inventory.events.BeforeItemPutInInventory;
+import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.engine.registry.In;
+import org.terasology.module.inventory.events.BeforeItemPutInInventory;
 import org.terasology.workstation.component.WorkstationComponent;
 import org.terasology.workstation.process.WorkstationProcess;
 

diff --git a/src/main/java/org/terasology/workstation/ui/InventoryItem.java b/src/main/java/org/terasology/workstation/ui/InventoryItem.java
@@ -3,7 +3,7 @@
 package org.terasology.workstation.ui;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.rendering.nui.layers.ingame.inventory.ItemCell;
+import org.terasology.module.inventory.ui.ItemCell;
 import org.terasology.nui.databinding.DefaultBinding;
 import org.terasology.nui.widgets.TooltipLine;
 import org.terasology.nui.widgets.UIList;