Cleanup and formatting
This commit is contained in:
parent
b96e17aefc
commit
895749d1bb
16 changed files with 29 additions and 31 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -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
|
||||||
{
|
{
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue