diff --git a/src/main/java/resonantinduction/api/fluid/IDrain.java b/src/main/java/resonantinduction/api/fluid/IDrain.java index 5463e97e..4bd7cb0e 100644 --- a/src/main/java/resonantinduction/api/fluid/IDrain.java +++ b/src/main/java/resonantinduction/api/fluid/IDrain.java @@ -1,9 +1,7 @@ package resonantinduction.api.fluid; import java.util.List; -import java.util.Set; -import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.tile.IRotatable; diff --git a/src/main/java/resonantinduction/archaic/CommonProxy.java b/src/main/java/resonantinduction/archaic/CommonProxy.java index 4fb24c27..805cbfec 100644 --- a/src/main/java/resonantinduction/archaic/CommonProxy.java +++ b/src/main/java/resonantinduction/archaic/CommonProxy.java @@ -1,6 +1,6 @@ package resonantinduction.archaic; -import resonantinduction.core.prefab.ProxyBase; +import calclavia.lib.prefab.ProxyBase; public class CommonProxy extends ProxyBase { diff --git a/src/main/java/resonantinduction/archaic/engineering/RenderEngineeringTable.java b/src/main/java/resonantinduction/archaic/engineering/RenderEngineeringTable.java index 8bf9dbdc..7874bdba 100644 --- a/src/main/java/resonantinduction/archaic/engineering/RenderEngineeringTable.java +++ b/src/main/java/resonantinduction/archaic/engineering/RenderEngineeringTable.java @@ -1,11 +1,7 @@ package resonantinduction.archaic.engineering; -import org.lwjgl.opengl.GL11; - -import calclavia.lib.render.RenderUtility; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.render.RenderItemOverlayTile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/core/CommonProxy.java b/src/main/java/resonantinduction/core/CommonProxy.java index 212f7b90..ab4b1328 100644 --- a/src/main/java/resonantinduction/core/CommonProxy.java +++ b/src/main/java/resonantinduction/core/CommonProxy.java @@ -4,8 +4,8 @@ package resonantinduction.core; import net.minecraft.world.World; -import resonantinduction.core.prefab.ProxyBase; import universalelectricity.api.vector.Vector3; +import calclavia.lib.prefab.ProxyBase; /** * @author Calclavia diff --git a/src/main/java/resonantinduction/core/debug/BlockDebug.java b/src/main/java/resonantinduction/core/debug/BlockDebug.java index 06043ccc..0c522012 100644 --- a/src/main/java/resonantinduction/core/debug/BlockDebug.java +++ b/src/main/java/resonantinduction/core/debug/BlockDebug.java @@ -12,7 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInductionTabs; import resonantinduction.core.prefab.block.BlockRI; import calclavia.lib.content.IBlockInfo; diff --git a/src/main/java/resonantinduction/core/part/BlockMachineMaterial.java b/src/main/java/resonantinduction/core/part/BlockMachineMaterial.java index 689b1784..f7967066 100644 --- a/src/main/java/resonantinduction/core/part/BlockMachineMaterial.java +++ b/src/main/java/resonantinduction/core/part/BlockMachineMaterial.java @@ -7,7 +7,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import resonantinduction.core.Reference; -import resonantinduction.core.prefab.block.BlockBase; +import resonantinduction.core.prefab.block.BlockRI; /** * A block used to build machines or decoration. @@ -15,7 +15,7 @@ import resonantinduction.core.prefab.block.BlockBase; * @author Calclavia * */ -public class BlockMachineMaterial extends BlockBase +public class BlockMachineMaterial extends BlockRI { String[] iconNames = new String[] { "material_metal_side", "material_metal_top", "material_stone_brick", "material_stone_brick2", "material_stone_chiseled", "material_stone_cobble", "material_stone_cracked", "material_stone", "material_stone_slab", "material_stone_mossy", "material_steel_dark", "material_steel_tint", "material_steel" }; Icon[] icons = new Icon[iconNames.length]; diff --git a/src/main/java/resonantinduction/core/prefab/ProxyBase.java b/src/main/java/resonantinduction/core/prefab/ProxyBase.java deleted file mode 100644 index 1b121d34..00000000 --- a/src/main/java/resonantinduction/core/prefab/ProxyBase.java +++ /dev/null @@ -1,33 +0,0 @@ -package resonantinduction.core.prefab; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; - -public abstract class ProxyBase implements IGuiHandler -{ - public void preInit() - { - } - - public void init() - { - } - - public void postInit() - { - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - return null; - } - -} diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockBase.java b/src/main/java/resonantinduction/core/prefab/block/BlockBase.java deleted file mode 100644 index fc4fc5a8..00000000 --- a/src/main/java/resonantinduction/core/prefab/block/BlockBase.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * - */ -package resonantinduction.core.prefab.block; - -import net.minecraft.block.material.Material; -import net.minecraftforge.common.Configuration; -import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInductionTabs; -import resonantinduction.core.Settings; -import universalelectricity.api.UniversalElectricity; -import calclavia.lib.prefab.block.BlockAdvanced; - -/** @author Calclavia */ -public class BlockBase extends BlockAdvanced -{ - public BlockBase(String name) - { - this(name, UniversalElectricity.machine); - } - - public BlockBase(String name, Material material) - { - this(Settings.getNextBlockID(), name, material); - } - - public BlockBase(int id, String name, Material material) - { - super(Settings.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), material); - this.setCreativeTab(ResonantInductionTabs.CORE); - this.setUnlocalizedName(Reference.PREFIX + name); - this.setTextureName(Reference.PREFIX + name); - this.setHardness(1f); - } -} diff --git a/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java b/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java index 6f08a295..afcfbe27 100644 --- a/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java +++ b/src/main/java/resonantinduction/core/prefab/block/BlockRIRotatable.java @@ -1,6 +1,5 @@ package resonantinduction.core.prefab.block; -import codechicken.multipart.ControlKeyModifer; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.Configuration; import resonantinduction.core.Reference; @@ -8,6 +7,7 @@ import resonantinduction.core.ResonantInductionTabs; import resonantinduction.core.Settings; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockRotatable; +import codechicken.multipart.ControlKeyModifer; /** * @author Calclavia diff --git a/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java b/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java index 2cc39097..be760f45 100644 --- a/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java +++ b/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java @@ -11,7 +11,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.net.IConnector; import universalelectricity.api.net.INodeNetwork; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/core/resource/fluid/TileLiquidMixture.java b/src/main/java/resonantinduction/core/resource/fluid/TileLiquidMixture.java index 64f14536..ebf5424e 100644 --- a/src/main/java/resonantinduction/core/resource/fluid/TileLiquidMixture.java +++ b/src/main/java/resonantinduction/core/resource/fluid/TileLiquidMixture.java @@ -3,8 +3,6 @@ package resonantinduction.core.resource.fluid; import java.util.HashSet; import java.util.Set; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -13,6 +11,8 @@ import resonantinduction.api.recipe.MachineRecipes; import resonantinduction.api.recipe.MachineRecipes.RecipeType; import resonantinduction.core.resource.ResourceGenerator; import calclavia.lib.prefab.tile.TileAdvanced; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author Calclavia diff --git a/src/main/java/resonantinduction/electrical/CommonProxy.java b/src/main/java/resonantinduction/electrical/CommonProxy.java index 1752cfd3..18e791ba 100644 --- a/src/main/java/resonantinduction/electrical/CommonProxy.java +++ b/src/main/java/resonantinduction/electrical/CommonProxy.java @@ -5,12 +5,12 @@ import java.awt.Color; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonantinduction.core.prefab.ProxyBase; import resonantinduction.electrical.encoder.TileEncoder; import resonantinduction.electrical.encoder.gui.ContainerEncoder; import resonantinduction.electrical.multimeter.ContainerMultimeter; import resonantinduction.electrical.multimeter.PartMultimeter; import universalelectricity.api.vector.Vector3; +import calclavia.lib.prefab.ProxyBase; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/java/resonantinduction/electrical/Electrical.java b/src/main/java/resonantinduction/electrical/Electrical.java index 066972a6..d4e95bfb 100644 --- a/src/main/java/resonantinduction/electrical/Electrical.java +++ b/src/main/java/resonantinduction/electrical/Electrical.java @@ -15,9 +15,6 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInductionTabs; import resonantinduction.core.Settings; -import resonantinduction.core.part.BlockMachineMaterial; -import resonantinduction.electrical.armbot.BlockArmbot; -import resonantinduction.electrical.armbot.TileArmbot; import resonantinduction.electrical.battery.BlockBattery; import resonantinduction.electrical.battery.ItemBlockBattery; import resonantinduction.electrical.battery.TileBattery; @@ -33,15 +30,11 @@ import resonantinduction.electrical.generator.solar.TileSolarPanel; import resonantinduction.electrical.levitator.BlockLevitator; import resonantinduction.electrical.levitator.TileLevitator; import resonantinduction.electrical.multimeter.ItemMultimeter; -import resonantinduction.electrical.purifier.BlockMixer; import resonantinduction.electrical.tesla.BlockTesla; import resonantinduction.electrical.tesla.TileTesla; import resonantinduction.electrical.transformer.ItemTransformer; import resonantinduction.electrical.wire.EnumWireMaterial; import resonantinduction.electrical.wire.ItemWire; -import resonantinduction.mechanical.process.BlockGrinderWheel; -import resonantinduction.mechanical.process.TileGrinderWheel; -import resonantinduction.mechanical.process.TileMixer; import calclavia.lib.content.ContentRegistry; import calclavia.lib.network.PacketHandler; import calclavia.lib.recipe.UniversalRecipe; diff --git a/src/main/java/resonantinduction/electrical/MultipartElectrical.java b/src/main/java/resonantinduction/electrical/MultipartElectrical.java index 51de257c..10f7b9e3 100644 --- a/src/main/java/resonantinduction/electrical/MultipartElectrical.java +++ b/src/main/java/resonantinduction/electrical/MultipartElectrical.java @@ -6,8 +6,6 @@ import resonantinduction.electrical.wire.flat.PartFlatSwitchWire; import resonantinduction.electrical.wire.flat.PartFlatWire; import resonantinduction.electrical.wire.framed.PartFramedSwitchWire; import resonantinduction.electrical.wire.framed.PartFramedWire; -import resonantinduction.mechanical.fluid.pipe.PartPipe; -import resonantinduction.mechanical.gear.PartGear; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; diff --git a/src/main/java/resonantinduction/electrical/battery/RenderBattery.java b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java index 86c25461..c3545381 100644 --- a/src/main/java/resonantinduction/electrical/battery/RenderBattery.java +++ b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java @@ -8,8 +8,6 @@ import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glRotatef; import static org.lwjgl.opengl.GL11.glScalef; import static org.lwjgl.opengl.GL11.glTranslatef; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/resonantinduction/electrical/encoder/ItemDisk.java b/src/main/java/resonantinduction/electrical/encoder/ItemDisk.java index bbffafcf..7a958c82 100644 --- a/src/main/java/resonantinduction/electrical/encoder/ItemDisk.java +++ b/src/main/java/resonantinduction/electrical/encoder/ItemDisk.java @@ -9,8 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInductionTabs; -import resonantinduction.core.Settings; import resonantinduction.core.prefab.item.ItemRI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/electrical/encoder/TileEncoder.java b/src/main/java/resonantinduction/electrical/encoder/TileEncoder.java index 838b819d..fb908b7c 100644 --- a/src/main/java/resonantinduction/electrical/encoder/TileEncoder.java +++ b/src/main/java/resonantinduction/electrical/encoder/TileEncoder.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import resonantinduction.core.ResonantInduction; -import resonantinduction.electrical.Electrical; import resonantinduction.electrical.armbot.Program; import resonantinduction.electrical.armbot.task.TaskRotateTo; import resonantinduction.electrical.encoder.coding.IProgram; diff --git a/src/main/java/resonantinduction/electrical/encoder/gui/ContainerEncoder.java b/src/main/java/resonantinduction/electrical/encoder/gui/ContainerEncoder.java index d29cd1a5..b33b0977 100644 --- a/src/main/java/resonantinduction/electrical/encoder/gui/ContainerEncoder.java +++ b/src/main/java/resonantinduction/electrical/encoder/gui/ContainerEncoder.java @@ -1,8 +1,6 @@ package resonantinduction.electrical.encoder.gui; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import resonantinduction.electrical.encoder.ItemDisk; import resonantinduction.electrical.encoder.TileEncoder; diff --git a/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderInventory.java b/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderInventory.java index 0b62a99b..0e8be834 100644 --- a/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderInventory.java +++ b/src/main/java/resonantinduction/electrical/encoder/gui/GuiEncoderInventory.java @@ -2,12 +2,8 @@ package resonantinduction.electrical.encoder.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import resonantinduction.core.Reference; import resonantinduction.electrical.encoder.TileEncoder; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/electrical/generator/TileGenerator.java b/src/main/java/resonantinduction/electrical/generator/TileGenerator.java index 48f0ac73..8def098b 100644 --- a/src/main/java/resonantinduction/electrical/generator/TileGenerator.java +++ b/src/main/java/resonantinduction/electrical/generator/TileGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import resonantinduction.mechanical.network.IMechanical; import resonantinduction.mechanical.network.IMechanicalNetwork; -import resonantinduction.mechanical.network.MechanicalNetwork; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.tile.IRotatable; diff --git a/src/main/java/resonantinduction/electrical/levitator/BlockLevitator.java b/src/main/java/resonantinduction/electrical/levitator/BlockLevitator.java index 2ab274ae..92853be5 100644 --- a/src/main/java/resonantinduction/electrical/levitator/BlockLevitator.java +++ b/src/main/java/resonantinduction/electrical/levitator/BlockLevitator.java @@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; -import resonantinduction.core.prefab.block.BlockRI; import resonantinduction.core.prefab.block.BlockRIRotatable; import resonantinduction.core.render.RIBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/resonantinduction/electrical/purifier/BlockMixer.java b/src/main/java/resonantinduction/electrical/purifier/BlockMixer.java index 3e912bd4..bdcc2d0b 100644 --- a/src/main/java/resonantinduction/electrical/purifier/BlockMixer.java +++ b/src/main/java/resonantinduction/electrical/purifier/BlockMixer.java @@ -3,12 +3,10 @@ package resonantinduction.electrical.purifier; import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; import resonantinduction.core.Settings; import resonantinduction.core.prefab.block.BlockRIRotatable; import resonantinduction.mechanical.process.TileMixer; -import universalelectricity.api.vector.VectorWorld; /** * A block used to build machines. diff --git a/src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java b/src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java index 40ab81cc..ef3d45d2 100644 --- a/src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java +++ b/src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java @@ -11,8 +11,6 @@ import mffs.api.fortron.IServerThread; import net.minecraft.server.ServerListenThread; import net.minecraft.server.ThreadMinecraftServer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; /** * @author Calclavia diff --git a/src/main/java/resonantinduction/electrical/transformer/PartTransformer.java b/src/main/java/resonantinduction/electrical/transformer/PartTransformer.java index 5e008016..104eba7c 100644 --- a/src/main/java/resonantinduction/electrical/transformer/PartTransformer.java +++ b/src/main/java/resonantinduction/electrical/transformer/PartTransformer.java @@ -12,7 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; import resonantinduction.electrical.Electrical; -import resonantinduction.electrical.wire.framed.RenderFramedWire; import universalelectricity.api.electricity.IElectricalNetwork; import universalelectricity.api.electricity.IVoltageInput; import universalelectricity.api.electricity.IVoltageOutput; @@ -21,7 +20,6 @@ import universalelectricity.api.energy.IEnergyInterface; import universalelectricity.api.vector.VectorHelper; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; -import codechicken.lib.lighting.LazyLightMatrix; import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Rotation; import codechicken.lib.vec.Transformation; diff --git a/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java b/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java index e00812bc..bde382f3 100644 --- a/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java +++ b/src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java @@ -1,10 +1,5 @@ package resonantinduction.electrical.transformer; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.obj.WavefrontObject; @@ -12,9 +7,7 @@ import net.minecraftforge.client.model.obj.WavefrontObject; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; -import universalelectricity.api.vector.Vector3; import calclavia.lib.render.RenderUtility; -import calclavia.lib.utility.LanguageUtility; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java b/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java index e6e5abba..39d1404d 100644 --- a/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java +++ b/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java @@ -18,8 +18,6 @@ import resonantinduction.electrical.wire.EnumWireMaterial; import resonantinduction.electrical.wire.PartAdvancedWire; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.energy.IConductor; -import universalelectricity.api.energy.IEnergyNetwork; -import universalelectricity.api.net.IConnector; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; import codechicken.lib.data.MCDataInput; diff --git a/src/main/java/resonantinduction/mechanical/CommonProxy.java b/src/main/java/resonantinduction/mechanical/CommonProxy.java index 61b8da9e..e36d09cf 100644 --- a/src/main/java/resonantinduction/mechanical/CommonProxy.java +++ b/src/main/java/resonantinduction/mechanical/CommonProxy.java @@ -1,6 +1,6 @@ package resonantinduction.mechanical; -import resonantinduction.core.prefab.ProxyBase; +import calclavia.lib.prefab.ProxyBase; public class CommonProxy extends ProxyBase { diff --git a/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java b/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java index ac9d9e0c..579daad1 100644 --- a/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java +++ b/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java @@ -16,7 +16,6 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.Mechanical; import resonantinduction.mechanical.network.IMechanical; -import resonantinduction.mechanical.network.IMechanicalNetwork; import resonantinduction.mechanical.network.TileMechanical; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.IPacketReceiverWithID; diff --git a/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java index d7d711df..1b18e8b1 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java +++ b/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java @@ -9,7 +9,6 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import resonantinduction.api.fluid.IFluidConnector; import resonantinduction.api.fluid.IFluidNetwork; -import resonantinduction.api.fluid.IFluidPipe; import universalelectricity.api.net.IUpdate; import universalelectricity.core.net.NetworkTickHandler; import universalelectricity.core.net.NodeNetwork; diff --git a/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java index dbff4f0f..3ae20ffd 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java +++ b/src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java @@ -5,14 +5,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import resonantinduction.api.fluid.IFluidConnector; import resonantinduction.api.fluid.IFluidNetwork; import resonantinduction.api.fluid.IFluidPipe; -import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.FluidUtility; /** diff --git a/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java index 18ad16fb..b6577a56 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java +++ b/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java @@ -1,6 +1,5 @@ package resonantinduction.mechanical.fluid.pipe; -import calclavia.lib.prefab.block.BlockAdvanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -18,6 +17,7 @@ import resonantinduction.api.fluid.IFluidPipe; import resonantinduction.core.prefab.part.PartFramedConnection; import resonantinduction.mechanical.Mechanical; import resonantinduction.mechanical.fluid.network.PipeNetwork; +import calclavia.lib.prefab.block.BlockAdvanced; import codechicken.microblock.IHollowConnect; import codechicken.multipart.JIconHitEffects; import codechicken.multipart.JNormalOcclusion; diff --git a/src/main/java/resonantinduction/mechanical/fluid/prefab/TileFluidNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/prefab/TileFluidNetwork.java index d51aabf7..85bd0e03 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/prefab/TileFluidNetwork.java +++ b/src/main/java/resonantinduction/mechanical/fluid/prefab/TileFluidNetwork.java @@ -17,7 +17,6 @@ import resonantinduction.api.fluid.IFluidConnector; import resonantinduction.api.fluid.IFluidNetwork; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.Mechanical; -import resonantinduction.mechanical.network.IMechanical; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.IPacketReceiverWithID; import calclavia.lib.network.PacketHandler; diff --git a/src/main/java/resonantinduction/mechanical/fluid/pump/BlockGrate.java b/src/main/java/resonantinduction/mechanical/fluid/pump/BlockGrate.java index 51c63ce4..4d0bdcb8 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/pump/BlockGrate.java +++ b/src/main/java/resonantinduction/mechanical/fluid/pump/BlockGrate.java @@ -1,9 +1,7 @@ package resonantinduction.mechanical.fluid.pump; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java b/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java index 75a99458..b1fbdef8 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java +++ b/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java @@ -11,7 +11,6 @@ import java.util.Set; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; import calclavia.lib.utility.FluidUtility; diff --git a/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java b/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java index 870ec436..83357d38 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java +++ b/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java @@ -1,10 +1,8 @@ package resonantinduction.mechanical.fluid.pump; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Set; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/resonantinduction/mechanical/gear/MultiPartMultiBlockHandler.java b/src/main/java/resonantinduction/mechanical/gear/MultiPartMultiBlockHandler.java index 4ccd1670..1da58982 100644 --- a/src/main/java/resonantinduction/mechanical/gear/MultiPartMultiBlockHandler.java +++ b/src/main/java/resonantinduction/mechanical/gear/MultiPartMultiBlockHandler.java @@ -1,12 +1,11 @@ package resonantinduction.mechanical.gear; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; -import calclavia.lib.multiblock.reference.IMultiBlockStructure; import calclavia.lib.multiblock.reference.MultiBlockHandler; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; public class MultiPartMultiBlockHandler extends MultiBlockHandler { diff --git a/src/main/java/resonantinduction/mechanical/gear/RenderGear.java b/src/main/java/resonantinduction/mechanical/gear/RenderGear.java index 573c97f2..d356499e 100644 --- a/src/main/java/resonantinduction/mechanical/gear/RenderGear.java +++ b/src/main/java/resonantinduction/mechanical/gear/RenderGear.java @@ -8,8 +8,8 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -import calclavia.lib.render.RenderUtility; import resonantinduction.core.Reference; +import calclavia.lib.render.RenderUtility; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/mechanical/item/ItemPipeGauge.java b/src/main/java/resonantinduction/mechanical/item/ItemPipeGauge.java index c451a93c..760087b9 100644 --- a/src/main/java/resonantinduction/mechanical/item/ItemPipeGauge.java +++ b/src/main/java/resonantinduction/mechanical/item/ItemPipeGauge.java @@ -1,11 +1,9 @@ package resonantinduction.mechanical.item; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatMessageComponent; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -13,7 +11,6 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import resonantinduction.api.IReadOut; import resonantinduction.api.IReadOut.EnumTools; -import resonantinduction.core.Reference; import resonantinduction.core.prefab.item.ItemRI; import calclavia.lib.utility.FluidUtility; diff --git a/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java b/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java index 7d882755..9b449711 100644 --- a/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java +++ b/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java @@ -5,10 +5,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.Set; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.mechanical.gear.PartGear; import universalelectricity.api.net.IUpdate; import universalelectricity.core.net.Network; import universalelectricity.core.net.NetworkTickHandler; diff --git a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java index 092ee987..1c5aa076 100644 --- a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java +++ b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java @@ -4,10 +4,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import calclavia.lib.network.PacketHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.ForgeDirection; import codechicken.lib.data.MCDataInput; diff --git a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java index ca6757cc..0fcfe00b 100644 --- a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java @@ -1,6 +1,5 @@ package resonantinduction.mechanical.process; -import calclavia.lib.utility.WorldUtility; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -12,7 +11,7 @@ import resonantinduction.core.Reference; import resonantinduction.core.Settings; import resonantinduction.core.prefab.block.BlockRIRotatable; import resonantinduction.core.render.RIBlockRenderingHandler; -import universalelectricity.api.vector.VectorWorld; +import calclavia.lib.utility.WorldUtility; /** * A block used to build machines. diff --git a/src/main/java/resonantinduction/mechanical/process/RenderGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/RenderGrinderWheel.java index b4a4bd65..fdbed1f4 100644 --- a/src/main/java/resonantinduction/mechanical/process/RenderGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/RenderGrinderWheel.java @@ -5,16 +5,14 @@ import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glRotatef; import static org.lwjgl.opengl.GL11.glScalef; import static org.lwjgl.opengl.GL11.glTranslatef; -import calclavia.lib.render.RenderUtility; -import calclavia.lib.utility.WorldUtility; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.obj.WavefrontObject; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; -import cpw.mods.fml.client.FMLClientHandler; +import calclavia.lib.render.RenderUtility; +import calclavia.lib.utility.WorldUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java index c77e2eb1..be84dea1 100644 --- a/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java @@ -1,24 +1,17 @@ package resonantinduction.mechanical.process; -import java.util.HashMap; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; import resonantinduction.api.recipe.MachineRecipes; import resonantinduction.api.recipe.MachineRecipes.RecipeType; -import resonantinduction.api.recipe.RecipeUtils.ItemStackResource; import resonantinduction.api.recipe.RecipeUtils.Resource; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; -import resonantinduction.mechanical.network.IMechanical; -import resonantinduction.mechanical.network.IMechanicalNetwork; import resonantinduction.mechanical.network.TileMechanical; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.tile.IRotatable; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; /** * @author Calclavia diff --git a/src/main/java/resonantinduction/mechanical/process/TileMixer.java b/src/main/java/resonantinduction/mechanical/process/TileMixer.java index adc41d26..05318c6e 100644 --- a/src/main/java/resonantinduction/mechanical/process/TileMixer.java +++ b/src/main/java/resonantinduction/mechanical/process/TileMixer.java @@ -16,7 +16,6 @@ import resonantinduction.api.recipe.MachineRecipes.RecipeType; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.resource.fluid.TileLiquidMixture; -import resonantinduction.mechanical.network.IMechanical; import resonantinduction.mechanical.network.TileMechanical; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/mechanical/process/Timer.java b/src/main/java/resonantinduction/mechanical/process/Timer.java index 58a2eaf7..2fe1f177 100644 --- a/src/main/java/resonantinduction/mechanical/process/Timer.java +++ b/src/main/java/resonantinduction/mechanical/process/Timer.java @@ -4,7 +4,6 @@ import java.util.HashMap; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.item.EntityItem; public class Timer { diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/models/wire.png b/src/main/resources/assets/resonantinduction/textures/blocks/models/wire.png new file mode 100644 index 00000000..85831eab Binary files /dev/null and b/src/main/resources/assets/resonantinduction/textures/blocks/models/wire.png differ