diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 629c04126..83027fec0 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -2,7 +2,6 @@ package mekanism.api; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.common.base.TileNetworkList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/common/base/TileNetworkList.java b/src/main/java/mekanism/api/TileNetworkList.java similarity index 95% rename from src/main/java/mekanism/common/base/TileNetworkList.java rename to src/main/java/mekanism/api/TileNetworkList.java index 7d28aac08..7c1229c83 100644 --- a/src/main/java/mekanism/common/base/TileNetworkList.java +++ b/src/main/java/mekanism/api/TileNetworkList.java @@ -1,4 +1,4 @@ -package mekanism.common.base; +package mekanism.api; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 6a3abc74d..62365c621 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -1,8 +1,5 @@ package mekanism.api.gas; -import mekanism.client.render.MekanismRenderer; -import mekanism.client.render.MekanismRenderer.FluidType; -import mekanism.common.Mekanism; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -185,12 +182,13 @@ public class Gas { * @return associated IIcon */ public TextureAtlasSprite getSprite() { + TextureMap texMap = Minecraft.getMinecraft().getTextureMapBlocks(); if (from_fluid) { - return MekanismRenderer.getFluidTexture(fluid, FluidType.STILL); + return texMap.getAtlasSprite(fluid.getStill().toString()); } if (sprite == null) { - sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getIcon().toString()); + sprite = texMap.getAtlasSprite(getIcon().toString()); } return sprite; diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 70ac46657..8bb75d8b1 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -8,7 +8,6 @@ import java.util.HashSet; import java.util.LinkedList; import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; -import mekanism.common.Mekanism; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -215,7 +214,7 @@ public class TransmitterNetworkRegistry { public void start() { if (queue.peek() != null) { - Mekanism.logger.error("OrphanPathFinder queue was not empty?!"); + logger.error("OrphanPathFinder queue was not empty?!"); queue.clear(); } queue.push(startPoint.coord()); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 54bac4676..3c86789ad 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -16,7 +16,7 @@ import mekanism.client.gui.element.GuiVisualsTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.miner.ThreadMinerSearch.State; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index f4231a0b2..1e09a8d46 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -12,7 +12,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.OreDictCache; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.miner.MItemStackFilter; import mekanism.common.content.miner.MMaterialFilter; import mekanism.common.content.miner.MModIDFilter; diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index 19ebb96f5..875a4920a 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -19,7 +19,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityElectrolyticSeparator; diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index d9fc3de6c..dace47f58 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -18,7 +18,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier.FactoryTier; import mekanism.common.base.IFactory.MachineFuelType; import mekanism.common.base.IFactory.RecipeType; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index da01926f9..e41a461fa 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -16,7 +16,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 5cbaaac63..88c93cc8a 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -11,7 +11,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 383ca1949..40a9b8c77 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -10,7 +10,7 @@ import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerLaserAmplifier; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLaserAmplifier; diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index f78d39ebe..a04b262db 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -15,7 +15,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismSounds; import mekanism.common.OreDictCache; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.content.transporter.TMaterialFilter; import mekanism.common.content.transporter.TModIDFilter; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 9d8e7e7df..a38276def 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -19,7 +19,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMetallurgicInfuser; diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 5e5363cb8..46a526d53 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -11,7 +11,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.inventory.container.ContainerQuantumEntangloporter; diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index ec0cc4562..d3967039b 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -14,7 +14,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 58106f8d2..532092f78 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -18,7 +18,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityRotaryCondensentrator; diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 032bce8f9..3c4fee044 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -9,7 +9,7 @@ import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiScrollList; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerSecurityDesk; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile.SecurityMode; diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index c8ec80063..e9994a48f 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -18,7 +18,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.inventory.container.ContainerNull; diff --git a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java index e7fb2eede..7b9cef6a1 100644 --- a/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiAmplifierTab.java @@ -4,7 +4,7 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 7d8c4bc2a..5eaf0bdac 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -4,7 +4,7 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index 943255102..e0f042504 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -1,6 +1,7 @@ package mekanism.common.base; import io.netty.buffer.ByteBuf; +import mekanism.api.TileNetworkList; import net.minecraft.nbt.NBTTagCompound; public interface ITileComponent { diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index a65ace387..1e7558e0d 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -1,6 +1,7 @@ package mekanism.common.base; import io.netty.buffer.ByteBuf; +import mekanism.api.TileNetworkList; /** * Internal interface used for blocks that send data between clients and the server diff --git a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java index 1a6b51113..1d4754b7c 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java +++ b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java @@ -2,7 +2,7 @@ package mekanism.common.capabilities; import io.netty.buffer.ByteBuf; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 6c1def495..d9e899c2c 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -6,7 +6,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.PacketHandler; import mekanism.common.Tier; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java index b18327013..9e1588145 100644 --- a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java @@ -1,7 +1,7 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IItemStackFilter; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java index 5c61c75eb..d9cc4728c 100644 --- a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java @@ -1,7 +1,7 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IMaterialFilter; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/content/miner/MModIDFilter.java b/src/main/java/mekanism/common/content/miner/MModIDFilter.java index 63bccc8ae..75b5721fd 100644 --- a/src/main/java/mekanism/common/content/miner/MModIDFilter.java +++ b/src/main/java/mekanism/common/content/miner/MModIDFilter.java @@ -2,7 +2,7 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IModIDFilter; import mekanism.common.content.transporter.Finder.ModIDFinder; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java index c7f35c3c7..1cb3959dc 100644 --- a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java @@ -2,7 +2,7 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IOreDictFilter; import mekanism.common.content.transporter.Finder.OreDictFinder; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index c3ed68221..7e9301760 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -1,7 +1,7 @@ package mekanism.common.content.miner; import io.netty.buffer.ByteBuf; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IFilter; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index 6b1df7872..8cefeee9d 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -1,7 +1,7 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IItemStackFilter; import mekanism.common.content.transporter.Finder.ItemStackFinder; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index 040d3ca85..45d0741ab 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -1,7 +1,7 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IMaterialFilter; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index 4b179c4b4..e293037bb 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -2,7 +2,7 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IModIDFilter; import mekanism.common.content.transporter.Finder.ModIDFinder; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index 03e21a19b..840c5e494 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -2,7 +2,7 @@ package mekanism.common.content.transporter; import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IOreDictFilter; import mekanism.common.content.transporter.Finder.OreDictFinder; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index da5af9ce3..943a41a7e 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.Arrays; import java.util.List; import mekanism.api.EnumColor; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.filter.IFilter; import mekanism.common.util.TransporterUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 9d8e54dda..143efd4a4 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -7,7 +7,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.PacketHandler; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.content.transporter.TransporterPathfinder.Destination; diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index 865d5e2a8..d0e2fa6d5 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -7,7 +7,7 @@ import java.util.UUID; import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index dae975ed7..f0158408b 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.UUID; import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index 7e9e3cd98..170a99385 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -10,7 +10,7 @@ import mcmultipart.api.slot.EnumFaceSlot; import mcmultipart.api.slot.IPartSlot; import mcmultipart.api.world.IMultipartBlockAccess; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 2e1dad6ce..98eb70b18 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -16,7 +16,7 @@ import mekanism.common.Tier.BinTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.base.ITierItem; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index dbf045fba..2a8b55e24 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -20,7 +20,7 @@ import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.MekanismHooks; diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 3f06cf2f1..e9ff07301 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -19,7 +19,7 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index 58cf8fe79..561727013 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.multipart.MultipartMekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 9f3956a3d..c1455ff4c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -31,7 +31,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index 4981579e3..77f383024 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -13,7 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.base.ITierItem; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.multipart.MultipartMekanism; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 1e46cbeb8..e7755f670 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -18,7 +18,7 @@ import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.base.IItemNetwork; import mekanism.common.base.ISideConfiguration; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.MekanismHooks; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java index 3d9290d62..392de9e0a 100644 --- a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -2,7 +2,7 @@ package mekanism.common.multiblock; import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 4a2b98deb..023929bcc 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -8,7 +8,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index d62202a17..b8b26642c 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -6,7 +6,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 986ec803a..b4f89a296 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -11,7 +11,7 @@ import mekanism.client.gui.filter.GuiMModIDFilter; import mekanism.client.gui.filter.GuiMOreDictFilter; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index 87da94928..c93d85719 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.miner.MinerFilter; import mekanism.common.content.transporter.TransporterFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 256202ca1..b76ce08cf 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.miner.MinerFilter; import mekanism.common.content.transporter.TransporterFilter; import mekanism.common.network.PacketNewFilter.NewFilterMessage; diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index e98d70e59..d67a16f6b 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -6,7 +6,7 @@ import mekanism.client.gui.GuiOredictionificator; import mekanism.client.gui.filter.GuiOredictionificatorFilter; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGuiMessage; diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 9dfe33337..49e721395 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -8,7 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.item.ItemPortableTeleporter; diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index 5c3d86b18..603b6a549 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CapabilityUtils; diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java index b169ae1ce..48b8a53a1 100644 --- a/src/main/java/mekanism/common/security/SecurityFrequency.java +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.UUID; import mekanism.common.HashList; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.security.ISecurityTile.SecurityMode; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index 46f641617..74427a212 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -9,7 +9,7 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTankInfo; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.IntegerInput; import mekanism.common.recipe.machines.AmbientGasRecipe; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 4caa81de3..c273e691f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -12,7 +12,7 @@ import mekanism.common.Tier.BinTier; import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ITierUpgradeable; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 2c2572981..56676fc17 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -8,7 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.boiler.BoilerCache; import mekanism.common.content.boiler.BoilerUpdateProtocol; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index fff21b66b..533ca2a52 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 81bdb98ca..2f2014945 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -7,7 +7,7 @@ import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index bcbad1be9..f041ae97b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -16,7 +16,7 @@ import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 9224ca252..2afa41be5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -13,7 +13,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.Upgrade; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 7149e484b..48d279ab8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -16,7 +16,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index b52d6fda6..d4b22c61e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -8,7 +8,7 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index b46609742..f684afa94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -17,10 +17,9 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; -import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 0331ef88e..df320167d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -21,7 +21,7 @@ import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.IChunkLoader; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index a1cd1899c..13750dcf7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -7,7 +7,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.content.tank.SynchronizedTankData.ValveData; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index e722e1a20..171e4d484 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -20,7 +20,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 99840a9d7..f49d5d18d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -19,7 +19,7 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.computer.IComputerIntegration; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 638dd8db2..3b072a796 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -14,7 +14,7 @@ import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITierUpgradeable; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index db7751fa0..89fed578a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -32,7 +32,7 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITierUpgradeable; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 4d9d8c306..6dac35a80 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -17,7 +17,7 @@ import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.ITierUpgradeable; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index a5a1ada1a..e7d3e4703 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -17,7 +17,7 @@ import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 84aaf2d82..0bc8361f5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -12,7 +12,7 @@ import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 73b588919..bba5aa244 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -7,7 +7,7 @@ import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 65be56fa3..54d86e775 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -20,7 +20,7 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITierUpgradeable; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java index 2b98b8a78..6614cf345 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java +++ b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.capabilities.Capabilities; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 289adc60c..8729b0010 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.matrix.MatrixCache; import mekanism.common.content.matrix.MatrixUpdateProtocol; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index b4b1eff23..0d658e1ac 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Tier.InductionCellTier; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index a8fce211d..aff8232f7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -16,7 +16,7 @@ import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.config.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java index c220d984c..009beb21a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionProvider.java @@ -3,7 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.common.Tier.InductionProviderTier; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 6920a455f..066c805dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -1,27 +1,18 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; -import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; -import mekanism.common.base.IActiveState; -import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.prefab.TileEntityEffectsBlock; -import mekanism.common.util.MekanismUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.RayTraceResult; -import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityLaser extends TileEntityEffectsBlock { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 8dafbee41..6eec6683f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -10,7 +10,7 @@ import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.computer.IComputerIntegration; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 53ad28e88..896d8dd89 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -8,7 +8,7 @@ import mekanism.api.lasers.ILaserReceptor; import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 1c9c617ca..0704682e7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -14,7 +14,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.client; diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 90ddab71e..d92d4ce56 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -18,7 +18,7 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITierUpgradeable; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 5212ac9f0..199c9bbdc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.multiblock.IMultiblock; import mekanism.common.multiblock.IStructuralMultiblock; import mekanism.common.multiblock.MultiblockCache; diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index f8d73b26b..40f5fa269 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -13,7 +13,7 @@ import mekanism.common.OreDictCache; import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 045307249..b332c7fc3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -18,7 +18,7 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 684e4fd3f..438458bf8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -25,7 +25,7 @@ import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.config.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index e71e0fde7..532556a63 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -7,7 +7,7 @@ import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index eddeb6f22..67100392c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -19,7 +19,7 @@ import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index e5f692e7f..3e517783a 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -7,7 +7,7 @@ import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IBoundingBlock; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.network.PacketSecurityUpdate.SecurityPacket; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 4070c2fe2..66feda0bb 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -8,7 +8,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.usage; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 09e6ec692..0d1080b2d 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -20,9 +20,8 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; -import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; @@ -39,7 +38,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.biome.BiomeDesert; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index c5b0178fc..fb041c25d 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -3,7 +3,7 @@ package mekanism.common.tile; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.multiblock.TileEntityInternalMultiblock; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 81cecd4ee..0ba822469 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -16,7 +16,7 @@ import mekanism.common.PacketHandler; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.config.MekanismConfig; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 33ffd0f2d..771597b32 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -10,7 +10,7 @@ import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.ITankManager; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.content.tank.TankUpdateProtocol; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java index 5c934e468..93e6cc6a6 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java @@ -8,7 +8,7 @@ import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.config.MekanismConfig.general; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 21cf04115..b78023ac4 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -11,7 +11,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; import mekanism.common.SideData.IOState; import mekanism.common.base.ITileComponent; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index b6d2bd7a5..2d0e9ed2b 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -14,7 +14,7 @@ import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java index d23cb9683..2c2792289 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ITileComponent; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 91aa489e2..673beaa0a 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -11,7 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeItem; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java index 4ca60f237..852c27533 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java @@ -14,7 +14,7 @@ import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.Upgrade; import mekanism.common.base.ISustainedData; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.AdvancedMachineInput; diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index 1ebb326d0..197a4f384 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -10,7 +10,7 @@ import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.ITileComponent; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java index 46323ca10..0287b5228 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityEffectsBlock.java @@ -7,8 +7,7 @@ import mekanism.api.Range4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; -import mekanism.common.base.IRedstoneControl.RedstoneControl; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 4be880b32..f252be465 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -8,7 +8,7 @@ import ic2.api.energy.tile.IEnergyEmitter; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.common.base.IEnergyWrapper; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.config.MekanismConfig.general; diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java index 74a068854..c13b1a350 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityMachine.java @@ -2,14 +2,10 @@ package mekanism.common.tile.prefab; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; -import mekanism.api.Coord4D; -import mekanism.api.Range4D; -import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TileNetworkList; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.api.TileNetworkList; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java index 71da52a0d..7fb9d64eb 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityOperationalMachine.java @@ -3,7 +3,7 @@ package mekanism.common.tile.prefab; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.common.Upgrade; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java index 4a7162889..9c293eefd 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index cf23df782..e055d35a2 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -12,7 +12,7 @@ import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TransporterTier; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index aee64c55a..791cf31ce 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -10,7 +10,7 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.PipeTier; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.transmitters.grid.FluidNetwork; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java index bd3f363d6..d3417e564 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java @@ -12,7 +12,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.grid.GasNetwork; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index c25a696cb..c7726a002 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -16,7 +16,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.base.ITileNetwork; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.BlockTransmitter; import mekanism.common.block.property.PropertyConnection; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index 8412438e0..ee216efc4 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -12,7 +12,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.ConductorTier; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 3baaf1a67..5dec86884 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -17,7 +17,7 @@ import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.CableTier; import mekanism.common.base.EnergyAcceptorWrapper; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; diff --git a/src/main/java/mekanism/common/util/TileUtils.java b/src/main/java/mekanism/common/util/TileUtils.java index 727ef28a2..0a6220cd9 100644 --- a/src/main/java/mekanism/common/util/TileUtils.java +++ b/src/main/java/mekanism/common/util/TileUtils.java @@ -5,7 +5,7 @@ import java.util.Arrays; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index ded4c2235..79e4c296d 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -12,7 +12,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.inventory.container.ContainerFilter; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 4090a6edf..48d102f31 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -13,7 +13,7 @@ import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index d17be1e64..ad9243891 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -7,7 +7,7 @@ import mekanism.client.gui.GuiMekanismTile; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 17a1f0629..3c10cc962 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -13,7 +13,7 @@ import mekanism.api.gas.GasTank; import mekanism.common.LaserManager; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 484997924..22cc93958 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -8,7 +8,7 @@ import mekanism.common.MekanismItems; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.ItemDataUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index aff0280ae..3655c7ff8 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -12,7 +12,7 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ChargeUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 2583b592a..f2cf67b57 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -3,14 +3,11 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.base.IActiveState; import mekanism.common.base.IRedstoneControl; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.computer.IComputerIntegration; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.prefab.TileEntityEffectsBlock; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index e5cca4f88..b6c1bcaa5 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -8,7 +8,7 @@ import mekanism.api.IHeatTransfer; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.CapabilityUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index d405cce18..fba41f985 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -2,8 +2,7 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; -import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; @@ -12,8 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeDesert; -import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 2aa8344e3..8602f0767 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -3,7 +3,7 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.base.IBoundingBlock; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index e91f31e87..90594c402 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -9,7 +9,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.base.IActiveState; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 54a3ea146..8a1619bef 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -2,7 +2,7 @@ package mekanism.generators.common.tile.reactor; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.integration.computer.IComputerIntegration; import mekanism.common.util.LangUtils; import net.minecraft.init.Items; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 1e2202547..f2aba24a5 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -17,7 +17,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 4a6bdacac..897ee4351 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.multiblock.MultiblockCache; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java index 20ace9f93..2f41aafee 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java @@ -1,21 +1,16 @@ package mekanism.generators.common.tile.turbine; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; -import java.util.List; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; -import mekanism.common.base.TileNetworkList; +import mekanism.api.TileNetworkList; import mekanism.common.multiblock.TileEntityInternalMultiblock; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.FMLCommonHandler;