diff --git a/archaic/src/main/java/resonantinduction/archaic/Archaic.java b/archaic/src/main/java/resonantinduction/archaic/Archaic.java index f88196a19..6cace0770 100644 --- a/archaic/src/main/java/resonantinduction/archaic/Archaic.java +++ b/archaic/src/main/java/resonantinduction/archaic/Archaic.java @@ -28,6 +28,7 @@ import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; import resonantinduction.core.TabRI; import resonantinduction.core.prefab.imprint.ItemImprint; +import resonantinduction.mechanical.gear.ItemHandCrank; import calclavia.lib.content.ContentRegistry; import calclavia.lib.network.PacketAnnotation; import calclavia.lib.network.PacketHandler; @@ -82,6 +83,7 @@ public class Archaic // Machine and Processing public static Item itemHammer; + public static Item itemHandCrank; @EventHandler public void preInit(FMLPreInitializationEvent evt) @@ -98,6 +100,7 @@ public class Archaic blockCast = contentRegistry.createTile(BlockCastingMold.class, TileCastingMold.class); blockChannel = contentRegistry.createTile(BlockGutter.class, TileGutter.class); + itemHandCrank = contentRegistry.createItem(ItemHandCrank.class); itemImprint = contentRegistry.createItem(ItemImprint.class); itemHammer = contentRegistry.createItem(ItemHammer.class); proxy.preInit(); @@ -135,6 +138,7 @@ public class Archaic GameRegistry.addRecipe(new ShapedOreRecipe(blockChannel, "S S", "I I", "III", 'S', Item.stick, 'I', "plankWood")); GameRegistry.addRecipe(new ShapedOreRecipe(blockHotPlate, "SSS", "III", 'I', Item.ingotIron, 'S', Block.stone)); GameRegistry.addRecipe(new ShapedOreRecipe(blockMillstone, "SPS", "SAS", "SSS", 'P', Block.pistonBase, 'A', Item.pickaxeStone, 'S', Block.stone)); + GameRegistry.addRecipe(new ShapedOreRecipe(itemHandCrank, "S ", "SSS", " S", 'S', Item.stick)); GameRegistry.addRecipe(new ShapedOreRecipe(itemImprint, "PPP", "PIP", "PPP", 'P', Item.paper, 'I', new ItemStack(Item.dyePowder, 0))); GameRegistry.addRecipe(new ShapedOreRecipe(itemHammer, "CC ", "CS ", " S", 'C', Block.cobblestone, 'S', Item.stick)); proxy.postInit(); diff --git a/archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java b/archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java index 62e562d55..8dd555150 100644 --- a/archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java +++ b/archaic/src/main/java/resonantinduction/archaic/gutter/TileGutter.java @@ -1,6 +1,5 @@ package resonantinduction.archaic.gutter; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -12,8 +11,6 @@ import resonantinduction.api.mechanical.fluid.IFluidNetwork; import resonantinduction.api.mechanical.fluid.IFluidPipe; import resonantinduction.core.prefab.fluid.PipeNetwork; import resonantinduction.core.prefab.fluid.TileFluidNetwork; -import calclavia.lib.multiblock.fake.IBlockActivate; -import calclavia.lib.utility.WrenchUtility; /** @author Darkguardsman */ public class TileGutter extends TileFluidNetwork implements IFluidPipe diff --git a/archaic/src/main/java/resonantinduction/archaic/piston/RenderPiston.java b/archaic/src/main/java/resonantinduction/archaic/piston/RenderPiston.java index 841baa603..3404924c7 100644 --- a/archaic/src/main/java/resonantinduction/archaic/piston/RenderPiston.java +++ b/archaic/src/main/java/resonantinduction/archaic/piston/RenderPiston.java @@ -3,14 +3,10 @@ package resonantinduction.archaic.piston; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; -import resonantinduction.core.render.RenderFluidHelper; -import calclavia.lib.render.RenderUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java b/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java index c9c7db52f..af0edd9d6 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java @@ -1,11 +1,9 @@ package resonantinduction.archaic.process; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.render.RIBlockRenderingHandler; diff --git a/archaic/src/main/java/resonantinduction/archaic/process/RenderCastingMold.java b/archaic/src/main/java/resonantinduction/archaic/process/RenderCastingMold.java index 6b95745be..70eacf568 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/RenderCastingMold.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/RenderCastingMold.java @@ -1,15 +1,14 @@ package resonantinduction.archaic.process; -import org.lwjgl.opengl.GL11; - -import calclavia.lib.render.RenderUtility; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; + +import org.lwjgl.opengl.GL11; + import resonantinduction.core.Reference; import resonantinduction.core.render.RenderItemOverlayTile; -import resonantinduction.electrical.battery.RenderBattery; +import calclavia.lib.render.RenderUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/archaic/src/main/java/resonantinduction/archaic/process/TileMillstone.java b/archaic/src/main/java/resonantinduction/archaic/process/TileMillstone.java index 9638fd485..209c600d2 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/TileMillstone.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/TileMillstone.java @@ -1,7 +1,5 @@ package resonantinduction.archaic.process; -import java.util.Map.Entry; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/electrical/src/main/java/resonantinduction/electrical/Electrical.java b/electrical/src/main/java/resonantinduction/electrical/Electrical.java index 64a4f2fbd..f4fd69640 100644 --- a/electrical/src/main/java/resonantinduction/electrical/Electrical.java +++ b/electrical/src/main/java/resonantinduction/electrical/Electrical.java @@ -161,7 +161,7 @@ public class Electrical * Recipes */ /** Tesla - by Jyzarc */ - GameRegistry.addRecipe(new ShapedOreRecipe(blockTesla, "WEW", " C ", " I ", 'W', "wire", 'E', Item.eyeOfEnder, 'C', UniversalRecipe.BATTERY.get(), 'I', UniversalRecipe.PRIMARY_PLATE.get())); + GameRegistry.addRecipe(new ShapedOreRecipe(blockTesla, "WEW", " C ", "DID", 'W', "wire", 'E', Item.eyeOfEnder, 'C', UniversalRecipe.BATTERY.get(), 'D', Item.diamond, 'I', UniversalRecipe.PRIMARY_PLATE.get())); /** Multimeter */ GameRegistry.addRecipe(new ShapedOreRecipe(itemMultimeter, "WWW", "ICI", 'W', "wire", 'C', UniversalRecipe.BATTERY.get(), 'I', UniversalRecipe.PRIMARY_METAL.get())); @@ -190,6 +190,9 @@ public class Electrical GameRegistry.addRecipe(new ShapedOreRecipe(itemTransformer, "WWW", "WWW", "III", 'W', "wire", 'I', UniversalRecipe.PRIMARY_METAL.get())); GameRegistry.addRecipe(new ShapedOreRecipe(itemLevitator, " G ", "SDS", "SWS", 'W', "wire", 'G', Block.glass, 'D', Block.blockDiamond, 'S', UniversalRecipe.PRIMARY_METAL.get())); + /** Quantum */ + GameRegistry.addRecipe(new ShapedOreRecipe(blockQuantumGate, "TTT", "LBL", "CCC", 'B', Block.blockDiamond, 'L', itemLevitator, 'C', itemCharger, 'T', blockTesla)); + /** Generators **/ GameRegistry.addRecipe(new ShapedOreRecipe(blockSolarPanel, "CCC", "WWW", "III", 'W', "wire", 'C', Item.coal, 'I', UniversalRecipe.PRIMARY_METAL.get())); GameRegistry.addRecipe(new ShapedOreRecipe(blockGenerator, "SRS", "SMS", "SWS", 'W', "wire", 'R', Item.redstone, 'M', UniversalRecipe.MOTOR.get(), 'S', UniversalRecipe.PRIMARY_METAL.get())); diff --git a/electrical/src/main/java/resonantinduction/electrical/battery/EnergyDistributionNetwork.java b/electrical/src/main/java/resonantinduction/electrical/battery/EnergyDistributionNetwork.java index ac979ec9d..66888f0e5 100644 --- a/electrical/src/main/java/resonantinduction/electrical/battery/EnergyDistributionNetwork.java +++ b/electrical/src/main/java/resonantinduction/electrical/battery/EnergyDistributionNetwork.java @@ -4,10 +4,6 @@ import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; -import calclavia.lib.utility.FluidUtility; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; -import resonantinduction.api.mechanical.fluid.IFluidConnector; import universalelectricity.core.net.Network; public class EnergyDistributionNetwork extends Network diff --git a/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java b/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java index 66c241b93..c5dd27b92 100644 --- a/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java +++ b/electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java @@ -17,7 +17,6 @@ import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.common.ForgeDirection; -import org.apache.commons.lang3.ArrayUtils; import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; diff --git a/electrical/src/main/java/resonantinduction/electrical/charger/ItemCharger.java b/electrical/src/main/java/resonantinduction/electrical/charger/ItemCharger.java index cda63d36c..6bf847125 100644 --- a/electrical/src/main/java/resonantinduction/electrical/charger/ItemCharger.java +++ b/electrical/src/main/java/resonantinduction/electrical/charger/ItemCharger.java @@ -2,11 +2,9 @@ package resonantinduction.electrical.charger; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import resonantinduction.core.prefab.part.IHighlight; -import resonantinduction.electrical.wire.EnumWireMaterial; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.FacePlacementGrid$; diff --git a/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java b/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java index f2f12bf95..fc8fc58fd 100644 --- a/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java +++ b/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java @@ -1,7 +1,5 @@ package resonantinduction.electrical.generator.thermopile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; @@ -9,6 +7,8 @@ import net.minecraft.world.World; import resonantinduction.core.Reference; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockTile; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockThermopile extends BlockTile { diff --git a/electrical/src/main/java/resonantinduction/electrical/levitator/PartLevitator.java b/electrical/src/main/java/resonantinduction/electrical/levitator/PartLevitator.java index ab792efa5..fcada6bca 100644 --- a/electrical/src/main/java/resonantinduction/electrical/levitator/PartLevitator.java +++ b/electrical/src/main/java/resonantinduction/electrical/levitator/PartLevitator.java @@ -1,6 +1,5 @@ package resonantinduction.electrical.levitator; -import java.awt.geom.CubicCurve2D; import java.lang.ref.WeakReference; import java.util.List; @@ -35,7 +34,6 @@ import calclavia.lib.utility.WrenchUtility; import calclavia.lib.utility.inventory.InventoryUtility; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; -import codechicken.lib.vec.Cuboid6; import codechicken.multipart.TMultiPart; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/electrical/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java b/electrical/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java index 20f69b39e..76179b2d8 100644 --- a/electrical/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java +++ b/electrical/src/main/java/resonantinduction/electrical/levitator/RenderLevitator.java @@ -1,12 +1,7 @@ package resonantinduction.electrical.levitator; -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; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; @@ -14,7 +9,6 @@ import org.lwjgl.opengl.GL11; import resonantinduction.core.Reference; import calclavia.lib.render.RenderUtility; -import calclavia.lib.render.block.ICustomBlockRenderer; import calclavia.lib.render.item.ISimpleItemRenderer; import cpw.mods.fml.client.FMLClientHandler; diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java index cb1da7141..95e8e6673 100644 --- a/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java +++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java @@ -6,9 +6,6 @@ package resonantinduction.electrical.multimeter; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import resonantinduction.core.Reference; -import universalelectricity.api.energy.UnitDisplay.Unit; import calclavia.lib.gui.GuiContainerBase; import calclavia.lib.render.EnumColor; import calclavia.lib.utility.LanguageUtility; diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java index e9c77cf4e..32ac5c961 100644 --- a/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java +++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java @@ -8,14 +8,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.prefab.part.IHighlight; import resonantinduction.electrical.wire.EnumWireMaterial; import calclavia.lib.utility.LanguageUtility; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.FacePlacementGrid$; -import codechicken.multipart.ControlKeyModifer; import codechicken.multipart.JItemMultiPart; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.TMultiPart; diff --git a/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java b/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java index cf57a539d..ce4ddcf77 100644 --- a/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java +++ b/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java @@ -4,7 +4,6 @@ package resonantinduction.electrical.tesla; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.EnumSet; import java.util.HashSet; @@ -25,8 +24,6 @@ import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; import resonantinduction.electrical.Electrical; -import resonantinduction.mechanical.fluid.transport.TileGrate; -import resonantinduction.mechanical.fluid.transport.TileGrate.ComparableVector; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; diff --git a/electrical/src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java b/electrical/src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java index 640579275..771ec85b6 100644 --- a/electrical/src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java +++ b/electrical/src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java @@ -2,11 +2,9 @@ package resonantinduction.electrical.transformer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import resonantinduction.core.prefab.part.IHighlight; -import resonantinduction.electrical.wire.EnumWireMaterial; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.microblock.FacePlacementGrid$; diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/framed/RenderFramedWire.java b/electrical/src/main/java/resonantinduction/electrical/wire/framed/RenderFramedWire.java index a629da664..7ebed86ba 100644 --- a/electrical/src/main/java/resonantinduction/electrical/wire/framed/RenderFramedWire.java +++ b/electrical/src/main/java/resonantinduction/electrical/wire/framed/RenderFramedWire.java @@ -3,7 +3,6 @@ package resonantinduction.electrical.wire.framed; import java.nio.FloatBuffer; import java.util.Map; -import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemDye; import net.minecraft.util.Icon; import net.minecraft.util.ResourceLocation; diff --git a/electrical/src/main/java/resonantinduction/quantum/gate/BlockQuantumGate.java b/electrical/src/main/java/resonantinduction/quantum/gate/BlockQuantumGate.java index 567f40132..60adc798a 100644 --- a/electrical/src/main/java/resonantinduction/quantum/gate/BlockQuantumGate.java +++ b/electrical/src/main/java/resonantinduction/quantum/gate/BlockQuantumGate.java @@ -2,18 +2,15 @@ package resonantinduction.quantum.gate; import java.util.Random; -import resonantinduction.core.ResonantInduction; -import resonantinduction.electrical.Electrical; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.electrical.Electrical; import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.utility.LanguageUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java index 47a05ebb4..102b7c78b 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -24,7 +24,6 @@ import resonantinduction.mechanical.fluid.transport.TilePump; import resonantinduction.mechanical.gear.ItemGear; import resonantinduction.mechanical.gear.ItemGearShaft; import resonantinduction.mechanical.gear.ItemHandCrank; -import resonantinduction.mechanical.item.ItemPipeGauge; import resonantinduction.mechanical.logistic.belt.BlockDetector; import resonantinduction.mechanical.logistic.belt.BlockManipulator; import resonantinduction.mechanical.logistic.belt.BlockRejector; @@ -83,7 +82,6 @@ public class Mechanical public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.DEFAULT); // Energy - public static Item itemHandCrank; public static Item itemGear; public static Item itemGearShaft; public static Block windTurbine; @@ -100,9 +98,7 @@ public class Mechanical public static Block blockReleaseValve; public static Block blockGrate; public static Block blockPump; - public static Item itemPipe; - public static Item itemPipeGuage; // Machines/Processes public static Block blockGrinderWheel; @@ -118,7 +114,6 @@ public class Mechanical NetworkRegistry.instance().registerGuiHandler(this, proxy); MinecraftForge.EVENT_BUS.register(new MicroblockHighlightHandler()); - itemHandCrank = contentRegistry.createItem(ItemHandCrank.class); itemGear = contentRegistry.createItem(ItemGear.class); itemGearShaft = contentRegistry.createItem(ItemGearShaft.class); windTurbine = contentRegistry.createTile(BlockWindTurbine.class, TileWindTurbine.class); @@ -133,7 +128,6 @@ public class Mechanical blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class); blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class); - itemPipeGuage = contentRegistry.createItem(ItemPipeGauge.class); itemPipe = contentRegistry.createItem(ItemPipe.class); // Machines @@ -163,7 +157,6 @@ public class Mechanical public void postInit(FMLPostInitializationEvent evt) { // Add recipes - GameRegistry.addRecipe(new ShapedOreRecipe(itemHandCrank, "S ", "SSS", " S", 'S', Item.stick)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemGear, 1, 0), "SWS", "W W", "SWS", 'W', "plankWood", 'S', Item.stick)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemGear, 1, 1), " W ", "WGW", " W ", 'G', new ItemStack(itemGear, 1, 0), 'W', Block.cobblestone)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemGear, 1, 2), " W ", "WGW", " W ", 'G', new ItemStack(itemGear, 1, 1), 'W', Item.ingotIron)); @@ -183,7 +176,6 @@ public class Mechanical GameRegistry.addRecipe(new ShapedOreRecipe(blockPump, "PPP", "GGG", "PPP", 'P', itemPipe, 'G', itemGear)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemPipe, 4), "BBB", " ", "BBB", 'B', UniversalRecipe.SECONDARY_METAL.get())); - GameRegistry.addRecipe(new ShapedOreRecipe(itemPipeGuage, "RRR", "GGG", " S ", 'S', Item.stick, 'G', Block.glass, 'R', Item.redstone)); GameRegistry.addRecipe(new ShapedOreRecipe(blockGrinderWheel, "III", "LGL", "III", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'L', "logWood", 'G', itemGear)); GameRegistry.addRecipe(new ShapedOreRecipe(blockPurifier, "IGI", "IGI", "IGI", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'G', itemGear)); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java b/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java index 1aafe15b2..0f1d7f781 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/belt/TileConveyorBelt.java @@ -18,7 +18,6 @@ import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.Mechanical; import resonantinduction.mechanical.network.TileMechanical; import universalelectricity.api.vector.Vector3; -import calclavia.lib.network.IPacketReceiverWithID; import calclavia.lib.prefab.tile.IRotatable; import com.google.common.io.ByteArrayDataInput; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java index 2368678d1..79756275c 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java @@ -1,11 +1,9 @@ package resonantinduction.mechanical.fluid.pipe; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.player.EntityPlayer; 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 net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -18,20 +16,15 @@ import resonantinduction.api.mechanical.fluid.IFluidPipe; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.fluid.PipeNetwork; import resonantinduction.core.prefab.part.PartFramedConnection; -import resonantinduction.electrical.wire.framed.RenderFramedWire; import resonantinduction.mechanical.Mechanical; -import universalelectricity.api.energy.IConductor; -import calclavia.lib.utility.WrenchUtility; import codechicken.lib.data.MCDataInput; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.IconTransformation; import codechicken.lib.render.RenderUtils; import codechicken.lib.vec.Translation; import codechicken.microblock.IHollowConnect; -import codechicken.multipart.JIconHitEffects; import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.TSlottedPart; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java index 8e4cdf0a1..fd67e4037 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/tank/TankNetwork.java @@ -8,7 +8,6 @@ import net.minecraftforge.fluids.FluidStack; import resonantinduction.api.mechanical.fluid.IFluidConnector; import resonantinduction.api.mechanical.fluid.IFluidNetwork; import resonantinduction.core.prefab.fluid.FluidNetwork; -import universalelectricity.core.net.NetworkTickHandler; /** * Network that handles connected tanks diff --git a/mechanical/src/main/java/resonantinduction/mechanical/gear/ItemHandCrank.java b/mechanical/src/main/java/resonantinduction/mechanical/gear/ItemHandCrank.java index 0a67a9556..d45f84939 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/gear/ItemHandCrank.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/gear/ItemHandCrank.java @@ -1,7 +1,5 @@ package resonantinduction.mechanical.gear; -import net.minecraft.block.Block; -import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; public class ItemHandCrank extends Item diff --git a/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java b/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java index 94ed12046..36823c797 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java @@ -24,7 +24,6 @@ import codechicken.lib.vec.Rotation; import codechicken.lib.vec.Transformation; import codechicken.lib.vec.Vector3; import codechicken.microblock.FaceMicroClass; -import codechicken.multipart.ControlKeyModifer; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import cpw.mods.fml.relauncher.Side; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/item/ItemPipeGauge.java b/mechanical/src/main/java/resonantinduction/mechanical/item/ItemPipeGauge.java deleted file mode 100644 index eb416b21d..000000000 --- a/mechanical/src/main/java/resonantinduction/mechanical/item/ItemPipeGauge.java +++ /dev/null @@ -1,67 +0,0 @@ -package resonantinduction.mechanical.item; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; -import resonantinduction.api.IInformation; -import calclavia.lib.utility.FluidUtility; - -public class ItemPipeGauge extends Item -{ - public ItemPipeGauge(int id) - { - super(id); - this.setHasSubtypes(true); - this.setMaxStackSize(1); - - } - - @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - TileEntity tileEntity = world.getBlockTileEntity(x, y, z); - ForgeDirection hitSide = ForgeDirection.getOrientation(side); - - if (tileEntity instanceof IInformation) - { - List list = new ArrayList(); - ((IInformation) tileEntity).getInformation(list); - - if (list.size() > 0) - { - for (String output : list) - player.addChatMessage(output); - return true; - } - } - if (tileEntity instanceof IFluidHandler) - { - FluidTankInfo[] tanks = ((IFluidHandler) tileEntity).getTankInfo(ForgeDirection.getOrientation(side)); - if (tanks != null) - { - player.sendChatToPlayer(ChatMessageComponent.createFromText("FluidHandler> Side:" + hitSide.toString() + " Tanks:" + tanks.length)); - - for (FluidStack stack : FluidUtility.getFluidList(tanks)) - player.addChatMessage("Fluid: " + stack.amount + "mb of " + stack.getFluid().getName()); - - return true; - } - } - - } - - return false; - } -} diff --git a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockDetector.java b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockDetector.java index 0ce1c111a..880a93bf2 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockDetector.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockDetector.java @@ -1,12 +1,9 @@ package resonantinduction.mechanical.logistic.belt; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java index 899d857d5..e9ac2e87f 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/network/TileMechanical.java @@ -8,7 +8,6 @@ import resonantinduction.api.mechanical.IMechanical; import resonantinduction.api.mechanical.IMechanicalNetwork; import resonantinduction.core.ResonantInduction; import resonantinduction.mechanical.Mechanical; -import resonantinduction.mechanical.fluid.transport.TilePump; import resonantinduction.mechanical.gear.PartGearShaft; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.IPacketReceiver; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java b/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java index 8ea10859d..e65c825d5 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java @@ -1,29 +1,9 @@ package resonantinduction.mechanical.process; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; -import resonantinduction.api.recipe.MachineRecipes; -import resonantinduction.api.recipe.MachineRecipes.RecipeType; -import resonantinduction.api.recipe.RecipeResource; -import resonantinduction.core.resource.ResourceGenerator; -import resonantinduction.core.resource.fluid.BlockFluidMixture; -import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.block.BlockTile; -import calclavia.lib.utility.LanguageUtility; -import calclavia.lib.utility.inventory.InventoryUtility; /** * Used for filtering liquid mixtures diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/TileFilter.java b/mechanical/src/main/java/resonantinduction/mechanical/process/TileFilter.java index fc268df5b..b9489b26d 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/TileFilter.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/TileFilter.java @@ -7,8 +7,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import resonantinduction.api.recipe.MachineRecipes; -import resonantinduction.api.recipe.RecipeResource; import resonantinduction.api.recipe.MachineRecipes.RecipeType; +import resonantinduction.api.recipe.RecipeResource; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; import universalelectricity.api.vector.Vector3; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java index ff048bfb2..190469cf7 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/TileMixer.java @@ -14,7 +14,6 @@ import resonantinduction.api.mechanical.IMechanical; import resonantinduction.api.recipe.MachineRecipes; import resonantinduction.api.recipe.MachineRecipes.RecipeType; import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInduction; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; import resonantinduction.mechanical.network.TileMechanical; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/turbine/RenderWaterTurbine.java b/mechanical/src/main/java/resonantinduction/mechanical/turbine/RenderWaterTurbine.java index 2206f50d4..be97ce223 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/turbine/RenderWaterTurbine.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/turbine/RenderWaterTurbine.java @@ -12,7 +12,6 @@ import resonantinduction.core.Reference; import calclavia.lib.prefab.turbine.TileTurbine; import calclavia.lib.render.RenderUtility; import calclavia.lib.render.item.ISimpleItemRenderer; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileMechanicalTurbine.java b/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileMechanicalTurbine.java index a6cac9ee5..cb5c3f931 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileMechanicalTurbine.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/turbine/TileMechanicalTurbine.java @@ -4,7 +4,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import resonantinduction.api.mechanical.IMechanical; import resonantinduction.api.mechanical.IMechanicalNetwork; -import resonantinduction.mechanical.gear.PartGearShaft; import resonantinduction.mechanical.network.MechanicalNetwork; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.turbine.TileTurbine; diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index 04d7c1171..7f51d92a5 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -1,15 +1,12 @@ package resonantinduction.core; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.BlockFluidFinite; -import net.minecraftforge.fluids.Fluid; import org.modstats.ModstatInfo; import org.modstats.Modstats; diff --git a/src/main/java/resonantinduction/core/nei/RICrusherRecipeHandler.java b/src/main/java/resonantinduction/core/nei/RICrusherRecipeHandler.java index 1b76dc6f2..9d494a066 100644 --- a/src/main/java/resonantinduction/core/nei/RICrusherRecipeHandler.java +++ b/src/main/java/resonantinduction/core/nei/RICrusherRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; -import calclavia.lib.utility.LanguageUtility; import resonantinduction.api.recipe.MachineRecipes.RecipeType; +import calclavia.lib.utility.LanguageUtility; public class RICrusherRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/java/resonantinduction/core/nei/RIGrinderRecipeHandler.java b/src/main/java/resonantinduction/core/nei/RIGrinderRecipeHandler.java index e3c22b049..ca2f9c4c8 100644 --- a/src/main/java/resonantinduction/core/nei/RIGrinderRecipeHandler.java +++ b/src/main/java/resonantinduction/core/nei/RIGrinderRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; -import calclavia.lib.utility.LanguageUtility; import resonantinduction.api.recipe.MachineRecipes.RecipeType; +import calclavia.lib.utility.LanguageUtility; public class RIGrinderRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/java/resonantinduction/core/nei/RIMixerRecipeHandler.java b/src/main/java/resonantinduction/core/nei/RIMixerRecipeHandler.java index 3fc287e53..90bde652d 100644 --- a/src/main/java/resonantinduction/core/nei/RIMixerRecipeHandler.java +++ b/src/main/java/resonantinduction/core/nei/RIMixerRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; -import calclavia.lib.utility.LanguageUtility; import resonantinduction.api.recipe.MachineRecipes.RecipeType; +import calclavia.lib.utility.LanguageUtility; public class RIMixerRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/java/resonantinduction/core/nei/RISawmillRecipeHandler.java b/src/main/java/resonantinduction/core/nei/RISawmillRecipeHandler.java index d0a4daff9..cb26284c8 100644 --- a/src/main/java/resonantinduction/core/nei/RISawmillRecipeHandler.java +++ b/src/main/java/resonantinduction/core/nei/RISawmillRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; -import calclavia.lib.utility.LanguageUtility; import resonantinduction.api.recipe.MachineRecipes.RecipeType; +import calclavia.lib.utility.LanguageUtility; public class RISawmillRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/java/resonantinduction/core/nei/RISmelterRecipeHandler.java b/src/main/java/resonantinduction/core/nei/RISmelterRecipeHandler.java index c189c1263..5a7bab7b8 100644 --- a/src/main/java/resonantinduction/core/nei/RISmelterRecipeHandler.java +++ b/src/main/java/resonantinduction/core/nei/RISmelterRecipeHandler.java @@ -1,7 +1,7 @@ package resonantinduction.core.nei; -import calclavia.lib.utility.LanguageUtility; import resonantinduction.api.recipe.MachineRecipes.RecipeType; +import calclavia.lib.utility.LanguageUtility; public class RISmelterRecipeHandler extends RITemplateRecipeHandler { diff --git a/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java b/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java index 2a49219a7..164df9cf5 100644 --- a/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java +++ b/src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java @@ -1,10 +1,5 @@ package resonantinduction.core.prefab.fluid; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map.Entry; - import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -13,7 +8,6 @@ import resonantinduction.api.mechanical.fluid.IFluidConnector; import resonantinduction.api.mechanical.fluid.IFluidNetwork; import resonantinduction.api.mechanical.fluid.IFluidPipe; import resonantinduction.api.mechanical.fluid.IPressure; -import calclavia.lib.utility.FluidUtility; /** * The network for pipe fluid transfer. getNodes() is NOT used. diff --git a/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java b/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java index f4413f366..b64d36979 100644 --- a/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java +++ b/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java @@ -2,19 +2,10 @@ package resonantinduction.core.resource.fluid; import java.util.List; -import calclavia.lib.utility.LanguageUtility; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import resonantinduction.core.Reference; -import resonantinduction.core.TabRI; -import resonantinduction.core.resource.ItemOreResource; -import resonantinduction.core.resource.ResourceGenerator; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumMovingObjectType; import net.minecraft.util.MovingObjectPosition; @@ -22,9 +13,15 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event; import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; +import resonantinduction.core.Reference; +import resonantinduction.core.TabRI; +import resonantinduction.core.resource.ItemOreResource; +import resonantinduction.core.resource.ResourceGenerator; +import calclavia.lib.utility.LanguageUtility; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Modified version of the MC bucket to meet the needs of a dynamic fluid registry system