diff --git a/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java b/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java index 3ab7a9e52..43e84a1f0 100755 --- a/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java +++ b/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java @@ -2,7 +2,7 @@ package refinedstorage.api; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; -import refinedstorage.api.storagenet.INetworkSlave; +import refinedstorage.api.network.INetworkSlave; public final class RefinedStorageCapabilities { @CapabilityInject(INetworkSlave.class) diff --git a/src/main/java/refinedstorage/api/storagenet/INetworkSlave.java b/src/main/java/refinedstorage/api/network/INetworkSlave.java similarity index 97% rename from src/main/java/refinedstorage/api/storagenet/INetworkSlave.java rename to src/main/java/refinedstorage/api/network/INetworkSlave.java index 35b28c615..be5a5fbd1 100755 --- a/src/main/java/refinedstorage/api/storagenet/INetworkSlave.java +++ b/src/main/java/refinedstorage/api/network/INetworkSlave.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storagenet; +package refinedstorage.api.network; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/refinedstorage/api/storagenet/NetworkMaster.java b/src/main/java/refinedstorage/api/network/NetworkMaster.java similarity index 99% rename from src/main/java/refinedstorage/api/storagenet/NetworkMaster.java rename to src/main/java/refinedstorage/api/network/NetworkMaster.java index c840ee55a..97a8d302a 100755 --- a/src/main/java/refinedstorage/api/storagenet/NetworkMaster.java +++ b/src/main/java/refinedstorage/api/network/NetworkMaster.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storagenet; +package refinedstorage.api.network; import cofh.api.energy.EnergyStorage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/refinedstorage/api/storagenet/NetworkMasterEventHandler.java b/src/main/java/refinedstorage/api/network/NetworkMasterEventHandler.java similarity index 95% rename from src/main/java/refinedstorage/api/storagenet/NetworkMasterEventHandler.java rename to src/main/java/refinedstorage/api/network/NetworkMasterEventHandler.java index 9e0f1e584..491315acf 100755 --- a/src/main/java/refinedstorage/api/storagenet/NetworkMasterEventHandler.java +++ b/src/main/java/refinedstorage/api/network/NetworkMasterEventHandler.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storagenet; +package refinedstorage.api.network; import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.world.WorldEvent; diff --git a/src/main/java/refinedstorage/api/storagenet/NetworkMasterRegistry.java b/src/main/java/refinedstorage/api/network/NetworkMasterRegistry.java similarity index 96% rename from src/main/java/refinedstorage/api/storagenet/NetworkMasterRegistry.java rename to src/main/java/refinedstorage/api/network/NetworkMasterRegistry.java index b9ebf0c42..aeb9deb1e 100755 --- a/src/main/java/refinedstorage/api/storagenet/NetworkMasterRegistry.java +++ b/src/main/java/refinedstorage/api/network/NetworkMasterRegistry.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storagenet; +package refinedstorage.api.network; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/refinedstorage/api/storagenet/NetworkMasterSavedData.java b/src/main/java/refinedstorage/api/network/NetworkMasterSavedData.java similarity index 98% rename from src/main/java/refinedstorage/api/storagenet/NetworkMasterSavedData.java rename to src/main/java/refinedstorage/api/network/NetworkMasterSavedData.java index 317b1ef98..d961324a9 100755 --- a/src/main/java/refinedstorage/api/storagenet/NetworkMasterSavedData.java +++ b/src/main/java/refinedstorage/api/network/NetworkMasterSavedData.java @@ -1,4 +1,4 @@ -package refinedstorage.api.storagenet; +package refinedstorage.api.network; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/refinedstorage/autocrafting/CraftingTaskScheduler.java b/src/main/java/refinedstorage/autocrafting/CraftingTaskScheduler.java index ad012324f..5c407dda3 100755 --- a/src/main/java/refinedstorage/autocrafting/CraftingTaskScheduler.java +++ b/src/main/java/refinedstorage/autocrafting/CraftingTaskScheduler.java @@ -3,7 +3,7 @@ package refinedstorage.autocrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; public class CraftingTaskScheduler { public static String NBT_SCHEDULED = "CraftingTaskScheduled"; diff --git a/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java b/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java index 11abf04e9..9b2494e25 100755 --- a/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java +++ b/src/main/java/refinedstorage/autocrafting/task/BasicCraftingTask.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.autocrafting.CraftingPattern; import java.util.ArrayList; diff --git a/src/main/java/refinedstorage/autocrafting/task/ICraftingTask.java b/src/main/java/refinedstorage/autocrafting/task/ICraftingTask.java index 7c1128139..8f2dfcf62 100755 --- a/src/main/java/refinedstorage/autocrafting/task/ICraftingTask.java +++ b/src/main/java/refinedstorage/autocrafting/task/ICraftingTask.java @@ -1,7 +1,7 @@ package refinedstorage.autocrafting.task; import net.minecraft.nbt.NBTTagCompound; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.autocrafting.CraftingPattern; public interface ICraftingTask { diff --git a/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java b/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java index b26658e7a..fb3a74eae 100755 --- a/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java +++ b/src/main/java/refinedstorage/autocrafting/task/ProcessingCraftingTask.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.autocrafting.CraftingPattern; import refinedstorage.tile.TileCrafter; diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index 26be35ae0..94ea38a12 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -20,8 +20,8 @@ import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageGui; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; import refinedstorage.item.ItemBlockController; import refinedstorage.tile.controller.TileController; diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 981c20f45..29b96b147 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -3,7 +3,7 @@ package refinedstorage.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.container.ContainerController; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.controller.ClientMachine; diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java index 44d1246e4..6841e9614 100755 --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import refinedstorage.RefinedStorageBlocks; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.block.EnumControllerType; import java.util.List; diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index dce92d0a4..c3060edf5 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -16,8 +16,8 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; import refinedstorage.tile.grid.TileGrid; import java.util.List; diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java b/src/main/java/refinedstorage/network/MessageGridCraftingStart.java index 22a5bb78c..6fbd6e24a 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingStart.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; public class MessageGridCraftingStart extends MessageHandlerPlayerToServer implements IMessage { private int x; diff --git a/src/main/java/refinedstorage/network/MessageGridItems.java b/src/main/java/refinedstorage/network/MessageGridItems.java index e9e8fee07..cade0d55a 100755 --- a/src/main/java/refinedstorage/network/MessageGridItems.java +++ b/src/main/java/refinedstorage/network/MessageGridItems.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.container.ContainerGrid; import refinedstorage.tile.ClientItem; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java b/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java index 420b520d6..443e2f7e9 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java +++ b/src/main/java/refinedstorage/network/MessageWirelessGridCraftingStart.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; public class MessageWirelessGridCraftingStart extends MessageHandlerPlayerToServer implements IMessage { private int controllerX; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridHeldItemPush.java b/src/main/java/refinedstorage/network/MessageWirelessGridHeldItemPush.java index 74ad659ea..46f8c5f32 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridHeldItemPush.java +++ b/src/main/java/refinedstorage/network/MessageWirelessGridHeldItemPush.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; public class MessageWirelessGridHeldItemPush extends MessageHandlerPlayerToServer implements IMessage { private int controllerX; diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java index 0282b7255..a1f52e818 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java +++ b/src/main/java/refinedstorage/network/MessageWirelessGridStoragePull.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; public class MessageWirelessGridStoragePull extends MessageHandlerPlayerToServer implements IMessage { private int controllerX; diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index a31f8ee0c..f491e85ee 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -17,10 +17,10 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; +import refinedstorage.api.network.NetworkMasterEventHandler; import refinedstorage.api.solderer.SoldererRecipeBasic; import refinedstorage.api.solderer.SoldererRegistry; import refinedstorage.api.storage.NBTStorage; -import refinedstorage.api.storagenet.NetworkMasterEventHandler; import refinedstorage.block.BlockBase; import refinedstorage.block.EnumControllerType; import refinedstorage.block.EnumGridType; diff --git a/src/main/java/refinedstorage/tile/TileSlave.java b/src/main/java/refinedstorage/tile/TileSlave.java index 50608f268..bfd9f38cc 100755 --- a/src/main/java/refinedstorage/tile/TileSlave.java +++ b/src/main/java/refinedstorage/tile/TileSlave.java @@ -6,9 +6,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.INetworkSlave; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.INetworkSlave; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.config.RedstoneMode; import refinedstorage.tile.controller.ControllerSearcher; diff --git a/src/main/java/refinedstorage/tile/controller/StorageHandler.java b/src/main/java/refinedstorage/tile/controller/StorageHandler.java index fceaf917e..570ebcf8f 100755 --- a/src/main/java/refinedstorage/tile/controller/StorageHandler.java +++ b/src/main/java/refinedstorage/tile/controller/StorageHandler.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.autocrafting.CraftingPattern; import refinedstorage.autocrafting.task.ICraftingTask; import refinedstorage.item.ItemWirelessGrid; diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index e5bee3839..9b125dcd3 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -9,9 +9,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.network.ByteBufUtils; import refinedstorage.RefinedStorageBlocks; -import refinedstorage.api.storagenet.INetworkSlave; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.INetworkSlave; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; import refinedstorage.block.BlockController; import refinedstorage.block.EnumControllerType; import refinedstorage.container.ContainerController; diff --git a/src/main/java/refinedstorage/tile/controller/WirelessGridHandler.java b/src/main/java/refinedstorage/tile/controller/WirelessGridHandler.java index 07df9ea47..12978a627 100755 --- a/src/main/java/refinedstorage/tile/controller/WirelessGridHandler.java +++ b/src/main/java/refinedstorage/tile/controller/WirelessGridHandler.java @@ -8,7 +8,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.NetworkMaster; +import refinedstorage.api.network.NetworkMaster; import refinedstorage.item.ItemWirelessGrid; import refinedstorage.tile.grid.WirelessGridConsumer; diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 615868b0b..6720edf60 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -7,8 +7,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageUtils; -import refinedstorage.api.storagenet.NetworkMaster; -import refinedstorage.api.storagenet.NetworkMasterRegistry; +import refinedstorage.api.network.NetworkMaster; +import refinedstorage.api.network.NetworkMasterRegistry; import refinedstorage.block.EnumGridType; import refinedstorage.item.ItemWirelessGrid; import refinedstorage.network.MessageWirelessGridCraftingStart;