From 62c7e658c55ba655727192f4dd5a0e89b9ce0d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 11 Dec 2020 18:17:06 +0100 Subject: [PATCH] Moved some packages to more logical places and aligned implementation with api package structure. --- src/main/java/li/cil/oc2/api/API.java | 2 +- .../device}/provider/BlockDeviceQuery.java | 2 +- .../device}/provider/DeviceProvider.java | 2 +- .../device}/provider/DeviceQuery.java | 2 +- .../bus}/device/provider/package-info.java | 2 +- .../cil/oc2/api/bus/device/rpc/RPCDevice.java | 2 +- .../cil/oc2/client/gui/terminal/Terminal.java | 2 +- .../java/li/cil/oc2/common/CommonSetup.java | 4 +- src/main/java/li/cil/oc2/common/IMC.java | 6 +-- .../li/cil/oc2/common/bus/RPCAdapter.java | 4 +- .../bus/TileEntityDeviceBusElement.java | 2 +- .../provider/EnergyStorageDeviceProvider.java | 6 ++- .../provider/FluidHandlerDeviceProvider.java | 6 ++- .../provider/ItemHandlerDeviceProvider.java | 6 ++- .../{ => bus}/device/provider/Providers.java | 41 ++++++++++++++++--- .../device/provider}/package-info.java | 2 +- ...CapabilityAnyTileEntityDeviceProvider.java | 2 +- ...actCapabilityTileEntityDeviceProvider.java | 4 +- .../provider/util}/AbstractObjectProxy.java | 2 +- .../AbstractTileEntityDeviceProvider.java | 8 ++-- .../provider/util}/BlockDeviceProvider.java | 10 ++--- .../util}/TileEntityDeviceProvider.java | 4 +- .../device/provider/util/package-info.java | 7 ++++ .../device/rpc}/RPCDeviceList.java | 2 +- .../rpc}/RPCMethodParameterTypeAdapters.java | 2 +- .../bus/device/rpc}/package-info.java | 2 +- .../DeviceBusElementCapability.java | 2 +- .../common/device/BlockDeviceQueryImpl.java | 36 ---------------- 28 files changed, 90 insertions(+), 82 deletions(-) rename src/main/java/li/cil/oc2/api/{ => bus/device}/provider/BlockDeviceQuery.java (95%) rename src/main/java/li/cil/oc2/api/{ => bus/device}/provider/DeviceProvider.java (97%) rename src/main/java/li/cil/oc2/api/{ => bus/device}/provider/DeviceQuery.java (77%) rename src/main/java/li/cil/oc2/{common => api/bus}/device/provider/package-info.java (78%) rename src/main/java/li/cil/oc2/common/{ => bus}/device/provider/EnergyStorageDeviceProvider.java (84%) rename src/main/java/li/cil/oc2/common/{ => bus}/device/provider/FluidHandlerDeviceProvider.java (84%) rename src/main/java/li/cil/oc2/common/{ => bus}/device/provider/ItemHandlerDeviceProvider.java (83%) rename src/main/java/li/cil/oc2/common/{ => bus}/device/provider/Providers.java (60%) rename src/main/java/li/cil/oc2/common/{device => bus/device/provider}/package-info.java (77%) rename src/main/java/li/cil/oc2/common/{device/provider => bus/device/provider/util}/AbstractCapabilityAnyTileEntityDeviceProvider.java (90%) rename src/main/java/li/cil/oc2/common/{device/provider => bus/device/provider/util}/AbstractCapabilityTileEntityDeviceProvider.java (93%) rename src/main/java/li/cil/oc2/common/{device/provider => bus/device/provider/util}/AbstractObjectProxy.java (92%) rename src/main/java/li/cil/oc2/common/{device/provider => bus/device/provider/util}/AbstractTileEntityDeviceProvider.java (83%) rename src/main/java/li/cil/oc2/common/{device/provider => bus/device/provider/util}/BlockDeviceProvider.java (77%) rename src/main/java/li/cil/oc2/common/{device/provider => bus/device/provider/util}/TileEntityDeviceProvider.java (89%) create mode 100644 src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java rename src/main/java/li/cil/oc2/common/{device => bus/device/rpc}/RPCDeviceList.java (96%) rename src/main/java/li/cil/oc2/common/{device => bus/device/rpc}/RPCMethodParameterTypeAdapters.java (95%) rename src/main/java/li/cil/oc2/{api/provider => common/bus/device/rpc}/package-info.java (79%) delete mode 100644 src/main/java/li/cil/oc2/common/device/BlockDeviceQueryImpl.java diff --git a/src/main/java/li/cil/oc2/api/API.java b/src/main/java/li/cil/oc2/api/API.java index d0593dbb..d5980687 100644 --- a/src/main/java/li/cil/oc2/api/API.java +++ b/src/main/java/li/cil/oc2/api/API.java @@ -2,9 +2,9 @@ package li.cil.oc2.api; import com.google.gson.GsonBuilder; import li.cil.oc2.api.bus.device.object.Callback; +import li.cil.oc2.api.bus.device.provider.DeviceProvider; import li.cil.oc2.api.bus.device.rpc.RPCMethod; import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; -import li.cil.oc2.api.provider.DeviceProvider; import java.lang.reflect.Type; diff --git a/src/main/java/li/cil/oc2/api/provider/BlockDeviceQuery.java b/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java similarity index 95% rename from src/main/java/li/cil/oc2/api/provider/BlockDeviceQuery.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java index a39b3f62..ac07c509 100644 --- a/src/main/java/li/cil/oc2/api/provider/BlockDeviceQuery.java +++ b/src/main/java/li/cil/oc2/api/bus/device/provider/BlockDeviceQuery.java @@ -1,4 +1,4 @@ -package li.cil.oc2.api.provider; +package li.cil.oc2.api.bus.device.provider; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/li/cil/oc2/api/provider/DeviceProvider.java b/src/main/java/li/cil/oc2/api/bus/device/provider/DeviceProvider.java similarity index 97% rename from src/main/java/li/cil/oc2/api/provider/DeviceProvider.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/DeviceProvider.java index cf0857cb..27e2a432 100644 --- a/src/main/java/li/cil/oc2/api/provider/DeviceProvider.java +++ b/src/main/java/li/cil/oc2/api/bus/device/provider/DeviceProvider.java @@ -1,4 +1,4 @@ -package li.cil.oc2.api.provider; +package li.cil.oc2.api.bus.device.provider; import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.device.object.ObjectDevice; diff --git a/src/main/java/li/cil/oc2/api/provider/DeviceQuery.java b/src/main/java/li/cil/oc2/api/bus/device/provider/DeviceQuery.java similarity index 77% rename from src/main/java/li/cil/oc2/api/provider/DeviceQuery.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/DeviceQuery.java index 1a909cdf..4de1148e 100644 --- a/src/main/java/li/cil/oc2/api/provider/DeviceQuery.java +++ b/src/main/java/li/cil/oc2/api/bus/device/provider/DeviceQuery.java @@ -1,4 +1,4 @@ -package li.cil.oc2.api.provider; +package li.cil.oc2.api.bus.device.provider; /** * Base interface for all queries to {@link DeviceProvider}s. diff --git a/src/main/java/li/cil/oc2/common/device/provider/package-info.java b/src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java similarity index 78% rename from src/main/java/li/cil/oc2/common/device/provider/package-info.java rename to src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java index 15f03c9a..fbf7c506 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/package-info.java +++ b/src/main/java/li/cil/oc2/api/bus/device/provider/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.common.device.provider; +package li.cil.oc2.api.bus.device.provider; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java b/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java index 6df0761c..779fd378 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java +++ b/src/main/java/li/cil/oc2/api/bus/device/rpc/RPCDevice.java @@ -2,7 +2,7 @@ package li.cil.oc2.api.bus.device.rpc; import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.provider.DeviceProvider; +import li.cil.oc2.api.bus.device.provider.DeviceProvider; import java.util.List; diff --git a/src/main/java/li/cil/oc2/client/gui/terminal/Terminal.java b/src/main/java/li/cil/oc2/client/gui/terminal/Terminal.java index aff56816..30a2f5ff 100644 --- a/src/main/java/li/cil/oc2/client/gui/terminal/Terminal.java +++ b/src/main/java/li/cil/oc2/client/gui/terminal/Terminal.java @@ -9,12 +9,12 @@ import li.cil.oc2.api.API; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldVertexBufferUploader; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.state.properties.NoteBlockInstrument; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/li/cil/oc2/common/CommonSetup.java b/src/main/java/li/cil/oc2/common/CommonSetup.java index c48f3ee9..f17b46b2 100644 --- a/src/main/java/li/cil/oc2/common/CommonSetup.java +++ b/src/main/java/li/cil/oc2/common/CommonSetup.java @@ -1,8 +1,8 @@ package li.cil.oc2.common; +import li.cil.oc2.common.bus.device.provider.Providers; +import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.device.RPCMethodParameterTypeAdapters; -import li.cil.oc2.common.device.provider.Providers; import li.cil.oc2.common.network.Network; import li.cil.oc2.common.vm.Allocator; import li.cil.oc2.serialization.BlobStorage; diff --git a/src/main/java/li/cil/oc2/common/IMC.java b/src/main/java/li/cil/oc2/common/IMC.java index ba984cdb..6f7deab6 100644 --- a/src/main/java/li/cil/oc2/common/IMC.java +++ b/src/main/java/li/cil/oc2/common/IMC.java @@ -1,10 +1,10 @@ package li.cil.oc2.common; import li.cil.oc2.api.API; +import li.cil.oc2.api.bus.device.provider.DeviceProvider; import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; -import li.cil.oc2.api.provider.DeviceProvider; -import li.cil.oc2.common.device.RPCMethodParameterTypeAdapters; -import li.cil.oc2.common.device.provider.Providers; +import li.cil.oc2.common.bus.device.provider.Providers; +import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; import net.minecraft.util.Util; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; diff --git a/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java b/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java index 81c03071..70306b2a 100644 --- a/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java +++ b/src/main/java/li/cil/oc2/common/bus/RPCAdapter.java @@ -8,8 +8,8 @@ import li.cil.oc2.api.bus.DeviceBusController; import li.cil.oc2.api.bus.device.rpc.RPCDevice; import li.cil.oc2.api.bus.device.rpc.RPCMethod; import li.cil.oc2.api.bus.device.rpc.RPCParameter; -import li.cil.oc2.common.device.RPCMethodParameterTypeAdapters; -import li.cil.oc2.common.device.RPCDeviceList; +import li.cil.oc2.common.bus.device.rpc.RPCDeviceList; +import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters; import li.cil.oc2.serialization.serializers.MessageJsonDeserializer; import li.cil.oc2.serialization.serializers.MethodInvocationJsonDeserializer; import li.cil.oc2.serialization.serializers.RPCDeviceWithIdentifierJsonSerializer; diff --git a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java index e23554b0..f17fdf03 100644 --- a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java +++ b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java @@ -5,8 +5,8 @@ import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.DeviceBus; import li.cil.oc2.api.bus.DeviceBusElement; import li.cil.oc2.common.ServerScheduler; +import li.cil.oc2.common.bus.device.provider.Providers; import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.device.provider.Providers; import li.cil.oc2.common.util.WorldUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; diff --git a/src/main/java/li/cil/oc2/common/device/provider/EnergyStorageDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageDeviceProvider.java similarity index 84% rename from src/main/java/li/cil/oc2/common/device/provider/EnergyStorageDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageDeviceProvider.java index 17768c59..34ccd82d 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/EnergyStorageDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageDeviceProvider.java @@ -1,9 +1,11 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider; import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.device.object.Callback; import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.common.bus.device.provider.util.AbstractCapabilityAnyTileEntityDeviceProvider; +import li.cil.oc2.common.bus.device.provider.util.AbstractObjectProxy; import li.cil.oc2.common.capabilities.Capabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.IEnergyStorage; diff --git a/src/main/java/li/cil/oc2/common/device/provider/FluidHandlerDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerDeviceProvider.java similarity index 84% rename from src/main/java/li/cil/oc2/common/device/provider/FluidHandlerDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerDeviceProvider.java index e1213eeb..9b5ac631 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/FluidHandlerDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerDeviceProvider.java @@ -1,9 +1,11 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider; import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.device.object.Callback; import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.common.bus.device.provider.util.AbstractCapabilityAnyTileEntityDeviceProvider; +import li.cil.oc2.common.bus.device.provider.util.AbstractObjectProxy; import li.cil.oc2.common.capabilities.Capabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/li/cil/oc2/common/device/provider/ItemHandlerDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerDeviceProvider.java similarity index 83% rename from src/main/java/li/cil/oc2/common/device/provider/ItemHandlerDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerDeviceProvider.java index a6ec695a..42308b39 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/ItemHandlerDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerDeviceProvider.java @@ -1,9 +1,11 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider; import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.device.object.Callback; import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.common.bus.device.provider.util.AbstractCapabilityAnyTileEntityDeviceProvider; +import li.cil.oc2.common.bus.device.provider.util.AbstractObjectProxy; import li.cil.oc2.common.capabilities.Capabilities; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/device/provider/Providers.java b/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java similarity index 60% rename from src/main/java/li/cil/oc2/common/device/provider/Providers.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java index 04430789..90141684 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/Providers.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java @@ -1,15 +1,18 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider; import li.cil.oc2.api.bus.Device; -import li.cil.oc2.api.provider.DeviceProvider; -import li.cil.oc2.api.provider.DeviceQuery; -import li.cil.oc2.common.device.BlockDeviceQueryImpl; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.DeviceProvider; +import li.cil.oc2.api.bus.device.provider.DeviceQuery; +import li.cil.oc2.common.bus.device.provider.util.BlockDeviceProvider; +import li.cil.oc2.common.bus.device.provider.util.TileEntityDeviceProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.LazyOptional; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -40,7 +43,7 @@ public final class Providers { } public static List> getDevices(final World world, final BlockPos pos, final Direction side) { - return getDevices(new BlockDeviceQueryImpl(world, pos, side)); + return getDevices(new BlockQuery(world, pos, side)); } public static List> getDevices(final DeviceQuery query) { @@ -53,4 +56,32 @@ public final class Providers { } return devices; } + + private static class BlockQuery implements BlockDeviceQuery { + private final World world; + private final BlockPos pos; + @Nullable private final Direction side; + + public BlockQuery(final World world, final BlockPos pos, @Nullable final Direction side) { + this.world = world; + this.pos = pos; + this.side = side; + } + + @Override + public World getWorld() { + return world; + } + + @Override + public BlockPos getQueryPosition() { + return pos; + } + + @Nullable + @Override + public Direction getQuerySide() { + return side; + } + } } diff --git a/src/main/java/li/cil/oc2/common/device/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java similarity index 77% rename from src/main/java/li/cil/oc2/common/device/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java index 4f55c409..7f699222 100644 --- a/src/main/java/li/cil/oc2/common/device/package-info.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.common.device; +package li.cil.oc2.common.bus.device.provider; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/device/provider/AbstractCapabilityAnyTileEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityAnyTileEntityDeviceProvider.java similarity index 90% rename from src/main/java/li/cil/oc2/common/device/provider/AbstractCapabilityAnyTileEntityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityAnyTileEntityDeviceProvider.java index f8ca6daa..bde4254b 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/AbstractCapabilityAnyTileEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityAnyTileEntityDeviceProvider.java @@ -1,4 +1,4 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider.util; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/li/cil/oc2/common/device/provider/AbstractCapabilityTileEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityTileEntityDeviceProvider.java similarity index 93% rename from src/main/java/li/cil/oc2/common/device/provider/AbstractCapabilityTileEntityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityTileEntityDeviceProvider.java index 84355227..0cd7baac 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/AbstractCapabilityTileEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityTileEntityDeviceProvider.java @@ -1,7 +1,7 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider.util; import li.cil.oc2.api.bus.Device; -import li.cil.oc2.api.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/device/provider/AbstractObjectProxy.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractObjectProxy.java similarity index 92% rename from src/main/java/li/cil/oc2/common/device/provider/AbstractObjectProxy.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractObjectProxy.java index c29d1d5a..97b3c40a 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/AbstractObjectProxy.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractObjectProxy.java @@ -1,4 +1,4 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider.util; import javax.annotation.Nullable; import java.util.Objects; diff --git a/src/main/java/li/cil/oc2/common/device/provider/AbstractTileEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractTileEntityDeviceProvider.java similarity index 83% rename from src/main/java/li/cil/oc2/common/device/provider/AbstractTileEntityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractTileEntityDeviceProvider.java index 267a9c9b..2eb91e57 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/AbstractTileEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractTileEntityDeviceProvider.java @@ -1,9 +1,9 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider.util; import li.cil.oc2.api.bus.Device; -import li.cil.oc2.api.provider.BlockDeviceQuery; -import li.cil.oc2.api.provider.DeviceProvider; -import li.cil.oc2.api.provider.DeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.DeviceProvider; +import li.cil.oc2.api.bus.device.provider.DeviceQuery; import li.cil.oc2.common.util.WorldUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/device/provider/BlockDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/BlockDeviceProvider.java similarity index 77% rename from src/main/java/li/cil/oc2/common/device/provider/BlockDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/BlockDeviceProvider.java index 72df3172..b83b87fe 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/BlockDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/BlockDeviceProvider.java @@ -1,11 +1,11 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider.util; import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.device.object.Callbacks; import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.provider.BlockDeviceQuery; -import li.cil.oc2.api.provider.DeviceProvider; -import li.cil.oc2.api.provider.DeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.DeviceProvider; +import li.cil.oc2.api.bus.device.provider.DeviceQuery; import li.cil.oc2.common.util.WorldUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -20,7 +20,7 @@ public class BlockDeviceProvider implements DeviceProvider { final BlockDeviceQuery blockQuery = (BlockDeviceQuery) query; final BlockState blockState = blockQuery.getWorld().getBlockState(blockQuery.getQueryPosition()); - if (blockState.isAir(blockQuery.getWorld(), blockQuery.getQueryPosition())) { + if (blockState.getBlock().isAir(blockState, blockQuery.getWorld(), blockQuery.getQueryPosition())) { return LazyOptional.empty(); } diff --git a/src/main/java/li/cil/oc2/common/device/provider/TileEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/TileEntityDeviceProvider.java similarity index 89% rename from src/main/java/li/cil/oc2/common/device/provider/TileEntityDeviceProvider.java rename to src/main/java/li/cil/oc2/common/bus/device/provider/util/TileEntityDeviceProvider.java index 76bc773d..b993cf97 100644 --- a/src/main/java/li/cil/oc2/common/device/provider/TileEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/TileEntityDeviceProvider.java @@ -1,9 +1,9 @@ -package li.cil.oc2.common.device.provider; +package li.cil.oc2.common.bus.device.provider.util; import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.device.object.Callbacks; import li.cil.oc2.api.bus.device.object.ObjectDevice; -import li.cil.oc2.api.provider.BlockDeviceQuery; +import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery; import li.cil.oc2.common.util.WorldUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java new file mode 100644 index 00000000..9fc4b086 --- /dev/null +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package li.cil.oc2.common.bus.device.provider.util; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/li/cil/oc2/common/device/RPCDeviceList.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java similarity index 96% rename from src/main/java/li/cil/oc2/common/device/RPCDeviceList.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java index 0ecde92e..8df88b99 100644 --- a/src/main/java/li/cil/oc2/common/device/RPCDeviceList.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCDeviceList.java @@ -1,4 +1,4 @@ -package li.cil.oc2.common.device; +package li.cil.oc2.common.bus.device.rpc; import li.cil.oc2.api.bus.device.rpc.RPCDevice; import li.cil.oc2.api.bus.device.rpc.RPCMethod; diff --git a/src/main/java/li/cil/oc2/common/device/RPCMethodParameterTypeAdapters.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java similarity index 95% rename from src/main/java/li/cil/oc2/common/device/RPCMethodParameterTypeAdapters.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java index adc024fe..95549895 100644 --- a/src/main/java/li/cil/oc2/common/device/RPCMethodParameterTypeAdapters.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/RPCMethodParameterTypeAdapters.java @@ -1,4 +1,4 @@ -package li.cil.oc2.common.device; +package li.cil.oc2.common.bus.device.rpc; import com.google.gson.GsonBuilder; import li.cil.oc2.api.imc.RPCMethodParameterTypeAdapter; diff --git a/src/main/java/li/cil/oc2/api/provider/package-info.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java similarity index 79% rename from src/main/java/li/cil/oc2/api/provider/package-info.java rename to src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java index 0d81fe07..3c54beca 100644 --- a/src/main/java/li/cil/oc2/api/provider/package-info.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package li.cil.oc2.api.provider; +package li.cil.oc2.common.bus.device.rpc; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/li/cil/oc2/common/capabilities/DeviceBusElementCapability.java b/src/main/java/li/cil/oc2/common/capabilities/DeviceBusElementCapability.java index a9ce30e4..fb310791 100644 --- a/src/main/java/li/cil/oc2/common/capabilities/DeviceBusElementCapability.java +++ b/src/main/java/li/cil/oc2/common/capabilities/DeviceBusElementCapability.java @@ -1,8 +1,8 @@ package li.cil.oc2.common.capabilities; +import li.cil.oc2.api.bus.Device; import li.cil.oc2.api.bus.DeviceBusController; import li.cil.oc2.api.bus.DeviceBusElement; -import li.cil.oc2.api.bus.Device; import net.minecraftforge.common.capabilities.CapabilityManager; import java.util.*; diff --git a/src/main/java/li/cil/oc2/common/device/BlockDeviceQueryImpl.java b/src/main/java/li/cil/oc2/common/device/BlockDeviceQueryImpl.java deleted file mode 100644 index 895433e5..00000000 --- a/src/main/java/li/cil/oc2/common/device/BlockDeviceQueryImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package li.cil.oc2.common.device; - -import li.cil.oc2.api.provider.BlockDeviceQuery; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class BlockDeviceQueryImpl implements BlockDeviceQuery { - private final World world; - private final BlockPos pos; - @Nullable private final Direction side; - - public BlockDeviceQueryImpl(final World world, final BlockPos pos, @Nullable final Direction side) { - this.world = world; - this.pos = pos; - this.side = side; - } - - @Override - public World getWorld() { - return world; - } - - @Override - public BlockPos getQueryPosition() { - return pos; - } - - @Nullable - @Override - public Direction getQuerySide() { - return side; - } -}