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

Terasology · Mar 17, 2021 · 6fb0649 · 6fb0649
2 parents 17d4685 + 93bc923
commit 6fb0649
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/org/terasology/fluidTransport/systems/ExtendedFluidManager.java b/src/main/java/org/terasology/fluidTransport/systems/ExtendedFluidManager.java
@@ -17,7 +17,7 @@
 
 import com.google.common.collect.Iterables;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.logic.inventory.InventoryAccessComponent;
+import org.terasology.module.inventory.components.InventoryAccessComponent;
 import org.terasology.engine.math.IntegerRange;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.fluid.component.FluidComponent;

diff --git a/src/main/java/org/terasology/fluidTransport/systems/FluidTankAuthoritySystem.java b/src/main/java/org/terasology/fluidTransport/systems/FluidTankAuthoritySystem.java
@@ -22,7 +22,7 @@
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.common.ActivateEvent;
-import org.terasology.engine.logic.inventory.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.fluid.component.FluidContainerItemComponent;

diff --git a/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java b/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java
@@ -25,7 +25,7 @@
 import org.terasology.engine.rendering.assets.mesh.MeshBuilder;
 import org.terasology.engine.rendering.assets.texture.Texture;
 import org.terasology.engine.rendering.logic.MeshComponent;
-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.engine.world.block.regions.BlockRegionComponent;
 import org.terasology.fluid.component.FluidInventoryComponent;

diff --git a/src/main/java/org/terasology/itemTransport/systems/OneWayItemConveyorAuthoritySystem.java b/src/main/java/org/terasology/itemTransport/systems/OneWayItemConveyorAuthoritySystem.java
@@ -16,11 +16,11 @@
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
 import org.terasology.engine.logic.delay.DelayManager;
 import org.terasology.engine.logic.delay.DelayedActionTriggeredEvent;
-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.InventorySlotChangedEvent;
-import org.terasology.engine.logic.inventory.events.InventorySlotStackSizeChangedEvent;
+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.InventorySlotChangedEvent;
+import org.terasology.module.inventory.events.InventorySlotStackSizeChangedEvent;
 import org.terasology.engine.math.Direction;
 import org.terasology.engine.math.Side;
 import org.terasology.engine.monitoring.PerformanceMonitor;

diff --git a/src/main/java/org/terasology/machines/ExtendedInventoryManager.java b/src/main/java/org/terasology/machines/ExtendedInventoryManager.java
@@ -18,7 +18,7 @@
 import com.google.common.collect.Lists;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.logic.inventory.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.workstation.process.WorkstationInventoryUtils;
 

diff --git a/...in/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java b/...in/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java
@@ -12,10 +12,10 @@
 import org.terasology.engine.entitySystem.prefab.Prefab;
 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.InventoryManager;
+import org.terasology.module.inventory.components.InventoryComponent;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
-import org.terasology.engine.logic.inventory.events.BeforeItemPutInInventory;
+import org.terasology.module.inventory.events.BeforeItemPutInInventory;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.utilities.Assets;

diff --git a/src/main/java/org/terasology/machines/systems/MachineCommonSystem.java b/src/main/java/org/terasology/machines/systems/MachineCommonSystem.java
@@ -21,8 +21,8 @@
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.common.RetainComponentsComponent;
-import org.terasology.engine.logic.inventory.InventoryAccessComponent;
-import org.terasology.engine.logic.inventory.InventoryComponent;
+import org.terasology.module.inventory.components.InventoryAccessComponent;
+import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.engine.math.IntegerRange;
 import org.terasology.engine.world.block.BlockComponent;
 import org.terasology.fluid.component.FluidInventoryComponent;

diff --git a/src/main/java/org/terasology/machines/systems/RenderInventoryInCategoryClientSystem.java b/src/main/java/org/terasology/machines/systems/RenderInventoryInCategoryClientSystem.java
@@ -23,7 +23,7 @@
 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.InventoryAccessComponent;
+import org.terasology.module.inventory.components.InventoryAccessComponent;
 import org.terasology.itemRendering.components.RenderInventorySlotsComponent;
 import org.terasology.machines.components.RenderInventoryInCategoryComponent;
 import org.terasology.workstation.process.WorkstationInventoryUtils;

diff --git a/...ava/org/terasology/machines/systems/SideActivatedInventoryInteractionAuthoritySystem.java b/...ava/org/terasology/machines/systems/SideActivatedInventoryInteractionAuthoritySystem.java
@@ -11,8 +11,8 @@
 import org.terasology.engine.input.binds.inventory.UseItemButton;
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.common.ActivateEvent;
-import org.terasology.engine.logic.inventory.InventoryComponent;
-import org.terasology.engine.logic.inventory.InventoryManager;
+import org.terasology.module.inventory.components.InventoryComponent;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.math.Direction;
 import org.terasology.engine.math.Side;

diff --git a/src/main/java/org/terasology/machines/ui/DefaultMachineWindow.java b/src/main/java/org/terasology/machines/ui/DefaultMachineWindow.java
@@ -10,7 +10,7 @@
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.registry.CoreRegistry;
 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.engine.utilities.Assets;
 import org.terasology.inGameHelp.InGameHelpClient;
 import org.terasology.machines.components.MachineDefinitionComponent;

diff --git a/src/main/java/org/terasology/mechanicalPower/systems/MechanicalPowerClientSystem.java b/src/main/java/org/terasology/mechanicalPower/systems/MechanicalPowerClientSystem.java
@@ -19,7 +19,7 @@
 import org.terasology.engine.math.Roll;
 import org.terasology.engine.math.Rotation;
 import org.terasology.engine.registry.In;
-import org.terasology.engine.rendering.nui.layers.ingame.inventory.GetItemTooltip;
+import org.terasology.module.inventory.ui.GetItemTooltip;
 import org.terasology.engine.world.block.BlockComponent;
 import org.terasology.engine.world.block.BlockManager;
 import org.terasology.engine.world.block.items.BlockItemComponent;