diff --git a/src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java b/src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java index 07e3ed82..c1374bc3 100644 --- a/src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java +++ b/src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java @@ -76,7 +76,7 @@ public class ALRecipeLoader public static Item itemDiggingTool; public static Item itemVehicleTest; public static Item itemMPWire; - + private static ALRecipeLoader instance; public static final String COPPER_WIRE = "wireCopper"; diff --git a/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java b/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java index 93528ba2..b2a5961d 100644 --- a/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java +++ b/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java @@ -303,7 +303,7 @@ public class AssemblyLine ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt()); ALRecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", AssemblyLine.MOD_ID, ItemFluidCan.class, true); ALRecipeLoader.itemParts = CoreRegistry.createNewItem("DMCraftingParts", AssemblyLine.MOD_ID, ItemParts.class, true); - + ALRecipeLoader.itemMetals = CoreRegistry.createNewItem("DMOreDirvParts", AssemblyLine.MOD_ID, ItemOreDirv.class, true); ALRecipeLoader.itemMPWire = CoreRegistry.createNewItem("DMMPWire", AssemblyLine.MOD_ID, ItemWire.class, true); diff --git a/src/main/java/com/builtbroken/assemblyline/crafting/BlockCraftingTable.java b/src/main/java/com/builtbroken/assemblyline/crafting/BlockCraftingTable.java index 2e40d9ec..f1257b57 100644 --- a/src/main/java/com/builtbroken/assemblyline/crafting/BlockCraftingTable.java +++ b/src/main/java/com/builtbroken/assemblyline/crafting/BlockCraftingTable.java @@ -29,12 +29,14 @@ public class BlockCraftingTable extends BlockMachine super(AssemblyLine.CONFIGURATION, "CraftingTable", Material.rock); } + @Override @SideOnly(Side.CLIENT) public Icon getIcon(int par1, int par2) { return par1 == 1 ? this.workbenchIconTop : (par1 == 0 ? Block.planks.getBlockTextureFromSide(par1) : (par1 != 2 && par1 != 4 ? this.blockIcon : this.workbenchIconFront)); } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { diff --git a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarBox.java b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarBox.java index 8e29f229..7d965c4d 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarBox.java +++ b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarBox.java @@ -17,7 +17,7 @@ public class TileEntitySolarBox extends TileEntityGenerator public void consumeFuel() { // TODO Auto-generated method stub - + } } diff --git a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java index f9ef957e..0dd26a10 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java +++ b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java @@ -43,15 +43,15 @@ public class TileEntitySolarPanel extends TileEntityGenerator } } else - { + { if (!this.worldObj.isThundering() && !this.worldObj.isRaining()) { this.setJoulesPerTick(BlockSolarPanel.wattNight); } } this.setJoulesPerSecound(this.JOULES_PER_TICK + this.JOULES_PER_TICK * (this.worldObj.provider instanceof ISolarLevel ? (int) ((ISolarLevel) this.worldObj.provider).getSolarEnergyMultiplier() : 0)); - } + } } - } + } } diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java b/src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java index 1a430000..b993a4a7 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java +++ b/src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; /** Simple battery to store energy - * + * * @author DarkGuardsman */ public class ItemBattery extends ItemElectric implements IExtraItemInfo { diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java b/src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java index 0d962322..45b0b6fd 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java +++ b/src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java @@ -12,7 +12,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.oredict.OreDictionary; -import com.builtbroken.assemblyline.ALRecipeLoader; import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.EnumMaterial; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java b/src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java index 6a13ca0a..6ac478f5 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** Small fluid can that is designed to store up to one bucket of fluid. Doesn't work like a bucket * as it is sealed with a pressure cap. This can is designed to work with tools or machines only. - * + * * @author DarkGuardsman */ public class ItemFluidCan extends ItemFluidContainer { diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java index 20e130e8..5d3e3724 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java @@ -13,7 +13,6 @@ import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; import com.builtbroken.minecraft.tilenetwork.INetworkEnergyPart; import com.builtbroken.minecraft.tilenetwork.ITileNetwork; import com.builtbroken.minecraft.tilenetwork.prefab.NetworkSharedPower; -import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities; /** A class to be inherited by all machines on the assembly line. This class acts as a single peace * in a network of similar tiles allowing all to share power from one or more sources diff --git a/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java b/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java index 838dcc05..1b806931 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java @@ -22,7 +22,7 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.Player; /** Conveyer belt TileEntity that allows entities of all kinds to be moved - * + * * @author DarkGuardsman */ public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt, IRotatable { diff --git a/src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java b/src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java index f39aa9ca..70607b8d 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java @@ -1,6 +1,5 @@ package com.builtbroken.assemblyline.machine.processor; -import universalelectricity.api.item.IEnergyItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -8,6 +7,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; import net.minecraft.item.ItemStack; +import universalelectricity.api.item.IEnergyItem; import com.builtbroken.minecraft.recipes.MachineRecipeHandler; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java b/src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java index a6999299..ec916fd3 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java @@ -18,7 +18,7 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.Player; /** Basic A -> B recipe processor machine designed mainly to handle ore blocks - * + * * @author DarkGuardsman */ public class TileEntityProcessor extends TileEntityEnergyMachine { diff --git a/src/main/java/com/builtbroken/assemblyline/multipart/ItemWire.java b/src/main/java/com/builtbroken/assemblyline/multipart/ItemWire.java index fdc12897..ec61f43e 100644 --- a/src/main/java/com/builtbroken/assemblyline/multipart/ItemWire.java +++ b/src/main/java/com/builtbroken/assemblyline/multipart/ItemWire.java @@ -21,7 +21,7 @@ public class ItemWire extends ItemMultipartBase @Override public TMultiPart newPart(ItemStack itemStack, EntityPlayer player, World world, BlockCoord pos, int side, Vector3 hit) { - return (PartBasicWire) MultiPartRegistry.createPart("assembly_line_basic_wire", false); + return MultiPartRegistry.createPart("assembly_line_basic_wire", false); } @Override diff --git a/src/main/java/com/builtbroken/assemblyline/multipart/MultipartAL.java b/src/main/java/com/builtbroken/assemblyline/multipart/MultipartAL.java index f0676bd8..81a39376 100644 --- a/src/main/java/com/builtbroken/assemblyline/multipart/MultipartAL.java +++ b/src/main/java/com/builtbroken/assemblyline/multipart/MultipartAL.java @@ -7,21 +7,21 @@ import codechicken.multipart.TMultiPart; public class MultipartAL implements IPartFactory { - public static MultipartAL INSTANCE; + public static MultipartAL INSTANCE; - public MultipartAL() - { - MultiPartRegistry.registerParts(this, new String[] { "assembly_line_basic_wire"}); - MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "com.builtbroken.assemblyline.multipart.TraitConductor"); - } + public MultipartAL() + { + MultiPartRegistry.registerParts(this, new String[] { "assembly_line_basic_wire" }); + MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "com.builtbroken.assemblyline.multipart.TraitConductor"); + } - @Override - public TMultiPart createPart(String name, boolean client) - { - if (name.equals("assembly_line_basic_wire")) - { - return new PartBasicWire(); - } - return null; - } + @Override + public TMultiPart createPart(String name, boolean client) + { + if (name.equals("assembly_line_basic_wire")) + { + return new PartBasicWire(); + } + return null; + } } \ No newline at end of file diff --git a/src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java b/src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java index b0d56faf..6d2c1751 100644 --- a/src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java +++ b/src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java @@ -10,7 +10,6 @@ import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; - //@UniversalClass public class PartBasicWire extends PartAdvanced implements IConductor { diff --git a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java b/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java index bdc8bec1..bcf6ce0c 100644 --- a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java +++ b/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java @@ -13,7 +13,6 @@ import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; -import com.builtbroken.assemblyline.machine.belt.TileEntityConveyor.SlantType; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;