Cleanup and formatting

This commit is contained in:
DarkGaurdsman 2013-12-28 22:28:23 -05:00
parent b96e17aefc
commit 895749d1bb
16 changed files with 29 additions and 31 deletions

View file

@ -76,7 +76,7 @@ public class ALRecipeLoader
public static Item itemDiggingTool; public static Item itemDiggingTool;
public static Item itemVehicleTest; public static Item itemVehicleTest;
public static Item itemMPWire; public static Item itemMPWire;
private static ALRecipeLoader instance; private static ALRecipeLoader instance;
public static final String COPPER_WIRE = "wireCopper"; public static final String COPPER_WIRE = "wireCopper";

View file

@ -303,7 +303,7 @@ public class AssemblyLine
ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt()); ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt());
ALRecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", AssemblyLine.MOD_ID, ItemFluidCan.class, true); ALRecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", AssemblyLine.MOD_ID, ItemFluidCan.class, true);
ALRecipeLoader.itemParts = CoreRegistry.createNewItem("DMCraftingParts", AssemblyLine.MOD_ID, ItemParts.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.itemMetals = CoreRegistry.createNewItem("DMOreDirvParts", AssemblyLine.MOD_ID, ItemOreDirv.class, true);
ALRecipeLoader.itemMPWire = CoreRegistry.createNewItem("DMMPWire", AssemblyLine.MOD_ID, ItemWire.class, true); ALRecipeLoader.itemMPWire = CoreRegistry.createNewItem("DMMPWire", AssemblyLine.MOD_ID, ItemWire.class, true);

View file

@ -29,12 +29,14 @@ public class BlockCraftingTable extends BlockMachine
super(AssemblyLine.CONFIGURATION, "CraftingTable", Material.rock); super(AssemblyLine.CONFIGURATION, "CraftingTable", Material.rock);
} }
@Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public Icon getIcon(int par1, int par2) 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)); return par1 == 1 ? this.workbenchIconTop : (par1 == 0 ? Block.planks.getBlockTextureFromSide(par1) : (par1 != 2 && par1 != 4 ? this.blockIcon : this.workbenchIconFront));
} }
@Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {

View file

@ -17,7 +17,7 @@ public class TileEntitySolarBox extends TileEntityGenerator
public void consumeFuel() public void consumeFuel()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
} }

View file

@ -43,15 +43,15 @@ public class TileEntitySolarPanel extends TileEntityGenerator
} }
} }
else else
{ {
if (!this.worldObj.isThundering() && !this.worldObj.isRaining()) if (!this.worldObj.isThundering() && !this.worldObj.isRaining())
{ {
this.setJoulesPerTick(BlockSolarPanel.wattNight); 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)); this.setJoulesPerSecound(this.JOULES_PER_TICK + this.JOULES_PER_TICK * (this.worldObj.provider instanceof ISolarLevel ? (int) ((ISolarLevel) this.worldObj.provider).getSolarEnergyMultiplier() : 0));
} }
} }
} }
} }

View file

@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
/** Simple battery to store energy /** Simple battery to store energy
* *
* @author DarkGuardsman */ * @author DarkGuardsman */
public class ItemBattery extends ItemElectric implements IExtraItemInfo public class ItemBattery extends ItemElectric implements IExtraItemInfo
{ {

View file

@ -12,7 +12,6 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.EnumMaterial; import com.builtbroken.minecraft.EnumMaterial;

View file

@ -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 /** 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. * as it is sealed with a pressure cap. This can is designed to work with tools or machines only.
* *
* @author DarkGuardsman */ * @author DarkGuardsman */
public class ItemFluidCan extends ItemFluidContainer public class ItemFluidCan extends ItemFluidContainer
{ {

View file

@ -13,7 +13,6 @@ import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;
import com.builtbroken.minecraft.tilenetwork.INetworkEnergyPart; import com.builtbroken.minecraft.tilenetwork.INetworkEnergyPart;
import com.builtbroken.minecraft.tilenetwork.ITileNetwork; import com.builtbroken.minecraft.tilenetwork.ITileNetwork;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkSharedPower; 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 /** 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 * in a network of similar tiles allowing all to share power from one or more sources

View file

@ -22,7 +22,7 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;
/** Conveyer belt TileEntity that allows entities of all kinds to be moved /** Conveyer belt TileEntity that allows entities of all kinds to be moved
* *
* @author DarkGuardsman */ * @author DarkGuardsman */
public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt, IRotatable public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt, IRotatable
{ {

View file

@ -1,6 +1,5 @@
package com.builtbroken.assemblyline.machine.processor; package com.builtbroken.assemblyline.machine.processor;
import universalelectricity.api.item.IEnergyItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
@ -8,6 +7,7 @@ import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.inventory.SlotFurnace; import net.minecraft.inventory.SlotFurnace;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import universalelectricity.api.item.IEnergyItem;
import com.builtbroken.minecraft.recipes.MachineRecipeHandler; import com.builtbroken.minecraft.recipes.MachineRecipeHandler;

View file

@ -18,7 +18,7 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;
/** Basic A -> B recipe processor machine designed mainly to handle ore blocks /** Basic A -> B recipe processor machine designed mainly to handle ore blocks
* *
* @author DarkGuardsman */ * @author DarkGuardsman */
public class TileEntityProcessor extends TileEntityEnergyMachine public class TileEntityProcessor extends TileEntityEnergyMachine
{ {

View file

@ -21,7 +21,7 @@ public class ItemWire extends ItemMultipartBase
@Override @Override
public TMultiPart newPart(ItemStack itemStack, EntityPlayer player, World world, BlockCoord pos, int side, Vector3 hit) 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 @Override

View file

@ -7,21 +7,21 @@ import codechicken.multipart.TMultiPart;
public class MultipartAL implements IPartFactory public class MultipartAL implements IPartFactory
{ {
public static MultipartAL INSTANCE; public static MultipartAL INSTANCE;
public MultipartAL() public MultipartAL()
{ {
MultiPartRegistry.registerParts(this, new String[] { "assembly_line_basic_wire"}); MultiPartRegistry.registerParts(this, new String[] { "assembly_line_basic_wire" });
MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "com.builtbroken.assemblyline.multipart.TraitConductor"); MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "com.builtbroken.assemblyline.multipart.TraitConductor");
} }
@Override @Override
public TMultiPart createPart(String name, boolean client) public TMultiPart createPart(String name, boolean client)
{ {
if (name.equals("assembly_line_basic_wire")) if (name.equals("assembly_line_basic_wire"))
{ {
return new PartBasicWire(); return new PartBasicWire();
} }
return null; return null;
} }
} }

View file

@ -10,7 +10,6 @@ import universalelectricity.api.energy.IEnergyNetwork;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorHelper; import universalelectricity.api.vector.VectorHelper;
//@UniversalClass //@UniversalClass
public class PartBasicWire extends PartAdvanced implements IConductor public class PartBasicWire extends PartAdvanced implements IConductor
{ {

View file

@ -13,7 +13,6 @@ import universalelectricity.api.energy.IEnergyNetwork;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorHelper; import universalelectricity.api.vector.VectorHelper;
import com.builtbroken.assemblyline.machine.belt.TileEntityConveyor.SlantType;
import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded; import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;