From 19d283b92376da793e7c88c443adbb3cd70b2c43 Mon Sep 17 00:00:00 2001 From: caelwarner Date: Wed, 19 Oct 2022 16:05:48 -0700 Subject: [PATCH] Moved all peripheral classes to computercraft.peripherals package --- .../{ => peripherals}/DisplayLinkPeripheral.java | 2 +- .../computercraft/{ => peripherals}/PeripheralBase.java | 3 ++- .../{ => peripherals}/SequencedGearshiftPeripheral.java | 3 ++- .../{ => peripherals}/SpeedControllerPeripheral.java | 2 +- .../{ => peripherals}/SpeedGaugePeripheral.java | 2 +- .../computercraft/{ => peripherals}/StationPeripheral.java | 5 ++++- .../{ => peripherals}/StressGaugePeripheral.java | 4 +++- .../{ => peripherals}/SyncedPeripheralBase.java | 5 ++++- .../relays/advanced/SpeedControllerTileEntity.java | 2 +- .../advanced/sequencer/SequencedGearshiftTileEntity.java | 2 +- .../contraptions/relays/gauge/SpeedGaugeTileEntity.java | 2 +- .../contraptions/relays/gauge/StressGaugeTileEntity.java | 2 +- .../logistics/block/display/DisplayLinkTileEntity.java | 2 +- .../management/edgePoint/station/StationTileEntity.java | 2 +- 14 files changed, 24 insertions(+), 14 deletions(-) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/DisplayLinkPeripheral.java (97%) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/PeripheralBase.java (77%) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/SequencedGearshiftPeripheral.java (92%) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/SpeedControllerPeripheral.java (93%) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/SpeedGaugePeripheral.java (88%) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/StationPeripheral.java (95%) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/StressGaugePeripheral.java (81%) rename src/main/java/com/simibubi/create/compat/computercraft/{ => peripherals}/SyncedPeripheralBase.java (79%) diff --git a/src/main/java/com/simibubi/create/compat/computercraft/DisplayLinkPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/DisplayLinkPeripheral.java similarity index 97% rename from src/main/java/com/simibubi/create/compat/computercraft/DisplayLinkPeripheral.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/DisplayLinkPeripheral.java index cae698c18..259260d67 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/DisplayLinkPeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/DisplayLinkPeripheral.java @@ -1,4 +1,4 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/simibubi/create/compat/computercraft/PeripheralBase.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/PeripheralBase.java similarity index 77% rename from src/main/java/com/simibubi/create/compat/computercraft/PeripheralBase.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/PeripheralBase.java index 794ede793..157e28af4 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/PeripheralBase.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/PeripheralBase.java @@ -1,5 +1,6 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; +import com.simibubi.create.compat.computercraft.ComputerControllable; import org.jetbrains.annotations.Nullable; import dan200.computercraft.api.peripheral.IPeripheral; diff --git a/src/main/java/com/simibubi/create/compat/computercraft/SequencedGearshiftPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SequencedGearshiftPeripheral.java similarity index 92% rename from src/main/java/com/simibubi/create/compat/computercraft/SequencedGearshiftPeripheral.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/SequencedGearshiftPeripheral.java index eb810b870..fc5e5e616 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/SequencedGearshiftPeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SequencedGearshiftPeripheral.java @@ -1,5 +1,6 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; +import com.simibubi.create.compat.computercraft.peripherals.SyncedPeripheralBase; import org.jetbrains.annotations.NotNull; import com.simibubi.create.content.contraptions.relays.advanced.sequencer.Instruction; diff --git a/src/main/java/com/simibubi/create/compat/computercraft/SpeedControllerPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SpeedControllerPeripheral.java similarity index 93% rename from src/main/java/com/simibubi/create/compat/computercraft/SpeedControllerPeripheral.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/SpeedControllerPeripheral.java index 57ed3617c..f67b2b123 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/SpeedControllerPeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SpeedControllerPeripheral.java @@ -1,4 +1,4 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/simibubi/create/compat/computercraft/SpeedGaugePeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SpeedGaugePeripheral.java similarity index 88% rename from src/main/java/com/simibubi/create/compat/computercraft/SpeedGaugePeripheral.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/SpeedGaugePeripheral.java index 077d1ccd2..cf0a22a27 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/SpeedGaugePeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SpeedGaugePeripheral.java @@ -1,4 +1,4 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/simibubi/create/compat/computercraft/StationPeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/StationPeripheral.java similarity index 95% rename from src/main/java/com/simibubi/create/compat/computercraft/StationPeripheral.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/StationPeripheral.java index 0e05c2180..c9206dd43 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/StationPeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/StationPeripheral.java @@ -1,9 +1,12 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; +import com.simibubi.create.compat.computercraft.CreateLuaTable; +import com.simibubi.create.compat.computercraft.peripherals.PeripheralBase; + import org.jetbrains.annotations.NotNull; import com.simibubi.create.content.logistics.trains.entity.Train; diff --git a/src/main/java/com/simibubi/create/compat/computercraft/StressGaugePeripheral.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/StressGaugePeripheral.java similarity index 81% rename from src/main/java/com/simibubi/create/compat/computercraft/StressGaugePeripheral.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/StressGaugePeripheral.java index 7e9d47c23..76004a40d 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/StressGaugePeripheral.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/StressGaugePeripheral.java @@ -1,4 +1,6 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; + +import com.simibubi.create.compat.computercraft.peripherals.PeripheralBase; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/simibubi/create/compat/computercraft/SyncedPeripheralBase.java b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SyncedPeripheralBase.java similarity index 79% rename from src/main/java/com/simibubi/create/compat/computercraft/SyncedPeripheralBase.java rename to src/main/java/com/simibubi/create/compat/computercraft/peripherals/SyncedPeripheralBase.java index c2d6b46a0..d5ba33237 100644 --- a/src/main/java/com/simibubi/create/compat/computercraft/SyncedPeripheralBase.java +++ b/src/main/java/com/simibubi/create/compat/computercraft/peripherals/SyncedPeripheralBase.java @@ -1,7 +1,10 @@ -package com.simibubi.create.compat.computercraft; +package com.simibubi.create.compat.computercraft.peripherals; import java.util.concurrent.atomic.AtomicInteger; +import com.simibubi.create.compat.computercraft.AttachedComputerPacket; +import com.simibubi.create.compat.computercraft.SyncedComputerControllable; +import com.simibubi.create.compat.computercraft.peripherals.PeripheralBase; import org.jetbrains.annotations.NotNull; import com.simibubi.create.foundation.networking.AllPackets; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerTileEntity.java index 2a38ebb6c..c155670f4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerTileEntity.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import com.simibubi.create.compat.computercraft.ComputerControllable; -import com.simibubi.create.compat.computercraft.SpeedControllerPeripheral; +import com.simibubi.create.compat.computercraft.peripherals.SpeedControllerPeripheral; import com.simibubi.create.content.contraptions.RotationPropagator; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.motor.CreativeMotorTileEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java index c6c9a44a0..ad6bca4db 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftTileEntity.java @@ -5,7 +5,7 @@ import java.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.simibubi.create.compat.computercraft.SequencedGearshiftPeripheral; +import com.simibubi.create.compat.computercraft.peripherals.SequencedGearshiftPeripheral; import com.simibubi.create.compat.computercraft.SyncedComputerControllable; import com.simibubi.create.content.contraptions.relays.encased.SplitShaftTileEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java index cd3dec3b8..ef0bee076 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.contraptions.relays.gauge; import java.util.List; -import com.simibubi.create.compat.computercraft.SpeedGaugePeripheral; +import com.simibubi.create.compat.computercraft.peripherals.SpeedGaugePeripheral; import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.Color; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java index 0b6ce38a6..09a74f246 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.contraptions.relays.gauge; import java.util.List; -import com.simibubi.create.compat.computercraft.StressGaugePeripheral; +import com.simibubi.create.compat.computercraft.peripherals.StressGaugePeripheral; import com.simibubi.create.content.contraptions.base.IRotate.StressImpact; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.item.ItemDescription; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkTileEntity.java index bf43c2a16..33372f119 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkTileEntity.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import com.simibubi.create.compat.computercraft.ComputerControllable; -import com.simibubi.create.compat.computercraft.DisplayLinkPeripheral; +import com.simibubi.create.compat.computercraft.peripherals.DisplayLinkPeripheral; import com.simibubi.create.content.logistics.block.display.source.DisplaySource; import com.simibubi.create.content.logistics.block.display.target.DisplayTarget; import com.simibubi.create.foundation.advancement.AllAdvancements; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java index 544984651..95510baf8 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java @@ -19,7 +19,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.Create; import com.simibubi.create.compat.computercraft.ComputerControllable; -import com.simibubi.create.compat.computercraft.StationPeripheral; +import com.simibubi.create.compat.computercraft.peripherals.StationPeripheral; import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException; import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableTE; import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;