Cleanup & formatting
This commit is contained in:
parent
20e1c5cfa8
commit
23b945e3bc
12 changed files with 10 additions and 76 deletions
|
@ -88,7 +88,6 @@ import com.builtbroken.assemblyline.machine.belt.BlockConveyorBelt;
|
||||||
import com.builtbroken.assemblyline.machine.encoder.BlockEncoder;
|
import com.builtbroken.assemblyline.machine.encoder.BlockEncoder;
|
||||||
import com.builtbroken.assemblyline.machine.encoder.ItemDisk;
|
import com.builtbroken.assemblyline.machine.encoder.ItemDisk;
|
||||||
import com.builtbroken.assemblyline.machine.processor.BlockProcessor;
|
import com.builtbroken.assemblyline.machine.processor.BlockProcessor;
|
||||||
import com.builtbroken.assemblyline.multipart.ItemWire;
|
|
||||||
import com.builtbroken.assemblyline.multipart.MultipartAL;
|
import com.builtbroken.assemblyline.multipart.MultipartAL;
|
||||||
import com.builtbroken.assemblyline.redstone.BlockAdvancedHopper;
|
import com.builtbroken.assemblyline.redstone.BlockAdvancedHopper;
|
||||||
import com.builtbroken.assemblyline.transmit.BlockWire;
|
import com.builtbroken.assemblyline.transmit.BlockWire;
|
||||||
|
|
|
@ -20,7 +20,6 @@ import com.builtbroken.common.Pair;
|
||||||
import com.builtbroken.minecraft.DarkCore;
|
import com.builtbroken.minecraft.DarkCore;
|
||||||
import com.builtbroken.minecraft.interfaces.IBlockActivated;
|
import com.builtbroken.minecraft.interfaces.IBlockActivated;
|
||||||
import com.builtbroken.minecraft.interfaces.IMultiBlock;
|
import com.builtbroken.minecraft.interfaces.IMultiBlock;
|
||||||
import com.builtbroken.minecraft.interfaces.IRotatable;
|
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
|
@ -155,6 +155,7 @@ public class ModelLargePipe extends ModelBase
|
||||||
FrontConnect.mirror = true;
|
FrontConnect.mirror = true;
|
||||||
setRotation(FrontConnect, 0F, 0F, 0F);
|
setRotation(FrontConnect, 0F, 0F, 0F);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void render(boolean[] side)
|
public void render(boolean[] side)
|
||||||
{
|
{
|
||||||
if (side[0])
|
if (side[0])
|
||||||
|
@ -183,6 +184,7 @@ public class ModelLargePipe extends ModelBase
|
||||||
}
|
}
|
||||||
renderMiddle();
|
renderMiddle();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderMiddle()
|
public void renderMiddle()
|
||||||
{
|
{
|
||||||
Mid.render(0.0625F);
|
Mid.render(0.0625F);
|
||||||
|
|
|
@ -8,7 +8,6 @@ package com.builtbroken.assemblyline.client.model;
|
||||||
|
|
||||||
import net.minecraft.client.model.ModelBase;
|
import net.minecraft.client.model.ModelBase;
|
||||||
import net.minecraft.client.model.ModelRenderer;
|
import net.minecraft.client.model.ModelRenderer;
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
|
|
||||||
public class ModelOpenTrough extends ModelBase
|
public class ModelOpenTrough extends ModelBase
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
package com.builtbroken.assemblyline.client.render;
|
package com.builtbroken.assemblyline.client.render;
|
||||||
|
|
||||||
import net.minecraft.client.renderer.RenderBlocks;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.client.IItemRenderer;
|
import net.minecraftforge.client.IItemRenderer;
|
||||||
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,6 @@ import java.util.HashMap;
|
||||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
|
||||||
import net.minecraftforge.fluids.FluidRegistry;
|
|
||||||
import net.minecraftforge.fluids.FluidStack;
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
@ -17,7 +15,6 @@ import com.builtbroken.assemblyline.client.model.ModelOpenTrough;
|
||||||
import com.builtbroken.assemblyline.fluid.pipes.EnumPipeType;
|
import com.builtbroken.assemblyline.fluid.pipes.EnumPipeType;
|
||||||
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
|
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
|
||||||
import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
|
import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
|
||||||
import com.builtbroken.assemblyline.machine.TileEntityTank;
|
|
||||||
import com.builtbroken.common.Pair;
|
import com.builtbroken.common.Pair;
|
||||||
import com.builtbroken.minecraft.DarkCore;
|
import com.builtbroken.minecraft.DarkCore;
|
||||||
|
|
||||||
|
@ -145,7 +142,7 @@ public class RenderPipe extends TileEntitySpecialRenderer
|
||||||
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
|
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
|
||||||
GL11.glScalef(1.0F, -1F, -1F);
|
GL11.glScalef(1.0F, -1F, -1F);
|
||||||
bindTexture(RenderPipe.getTexture(mat, 0));
|
bindTexture(RenderPipe.getTexture(mat, 0));
|
||||||
this.render(mat, ((TileEntityPipe) te).getSubID(), sides);
|
RenderPipe.render(mat, ((TileEntityPipe) te).getSubID(), sides);
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -153,7 +150,7 @@ public class RenderPipe extends TileEntitySpecialRenderer
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
|
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
|
||||||
GL11.glScalef(1.0F, -1F, -1F);
|
GL11.glScalef(1.0F, -1F, -1F);
|
||||||
this.render(mat, 0, new boolean[6]);
|
RenderPipe.render(mat, 0, new boolean[6]);
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,6 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import universalelectricity.api.vector.Vector3;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.EntityLivingBase;
|
import net.minecraft.entity.EntityLivingBase;
|
||||||
|
@ -19,6 +16,7 @@ import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.Configuration;
|
import net.minecraftforge.common.Configuration;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import net.minecraftforge.fluids.FluidTankInfo;
|
import net.minecraftforge.fluids.FluidTankInfo;
|
||||||
|
import universalelectricity.api.vector.Vector3;
|
||||||
|
|
||||||
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
|
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
|
||||||
import com.builtbroken.common.Pair;
|
import com.builtbroken.common.Pair;
|
||||||
|
|
|
@ -14,11 +14,11 @@ import com.builtbroken.minecraft.helpers.ColorCode;
|
||||||
|
|
||||||
/** Enum to hold info about each pipe material. Values are by default and some can change with pipe
|
/** Enum to hold info about each pipe material. Values are by default and some can change with pipe
|
||||||
* upgrades.
|
* upgrades.
|
||||||
*
|
*
|
||||||
* @Note unsupportedFluids should only be used by filters. All pipes should allow all fluid types.
|
* @Note unsupportedFluids should only be used by filters. All pipes should allow all fluid types.
|
||||||
* However, pipes that can't support the fluid should have an effect. Eg no gas support should cause
|
* However, pipes that can't support the fluid should have an effect. Eg no gas support should cause
|
||||||
* the pipe to leak. No molten support should cause the pipe to take damage.
|
* the pipe to leak. No molten support should cause the pipe to take damage.
|
||||||
*
|
*
|
||||||
* @author DarkGuardsman */
|
* @author DarkGuardsman */
|
||||||
public enum FluidPartsMaterial
|
public enum FluidPartsMaterial
|
||||||
{
|
{
|
||||||
|
|
|
@ -143,7 +143,7 @@ public class TileEntityPipe extends TileEntityFluidNetworkTile implements IColor
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Calculates flow rate based on viscosity & temp of the fluid as all other factors are know
|
/** Calculates flow rate based on viscosity & temp of the fluid as all other factors are know
|
||||||
*
|
*
|
||||||
* @param fluid - fluidStack
|
* @param fluid - fluidStack
|
||||||
* @param temp = tempature of the fluid
|
* @param temp = tempature of the fluid
|
||||||
* @param pressure - pressure difference of were the fluid is flowing too.
|
* @param pressure - pressure difference of were the fluid is flowing too.
|
||||||
|
|
|
@ -4,17 +4,13 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.IInventory;
|
|
||||||
import net.minecraft.inventory.ISidedInventory;
|
import net.minecraft.inventory.ISidedInventory;
|
||||||
import net.minecraft.inventory.InventoryCrafting;
|
import net.minecraft.inventory.InventoryCrafting;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.item.crafting.CraftingManager;
|
import net.minecraft.item.crafting.CraftingManager;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
|
||||||
import universalelectricity.api.vector.Vector3;
|
import universalelectricity.api.vector.Vector3;
|
||||||
import universalelectricity.api.vector.VectorHelper;
|
|
||||||
|
|
||||||
import com.builtbroken.assemblyline.api.AutoCraftEvent;
|
import com.builtbroken.assemblyline.api.AutoCraftEvent;
|
||||||
import com.builtbroken.assemblyline.api.IArmbot;
|
import com.builtbroken.assemblyline.api.IArmbot;
|
||||||
|
@ -23,7 +19,6 @@ import com.builtbroken.assemblyline.api.coding.args.ArgumentData;
|
||||||
import com.builtbroken.common.Pair;
|
import com.builtbroken.common.Pair;
|
||||||
import com.builtbroken.minecraft.TranslationHelper;
|
import com.builtbroken.minecraft.TranslationHelper;
|
||||||
import com.builtbroken.minecraft.prefab.TileEntityAdvanced;
|
import com.builtbroken.minecraft.prefab.TileEntityAdvanced;
|
||||||
import com.builtbroken.minecraft.prefab.TileEntityMulti;
|
|
||||||
import com.builtbroken.minecraft.prefab.invgui.ISlotPickResult;
|
import com.builtbroken.minecraft.prefab.invgui.ISlotPickResult;
|
||||||
import com.builtbroken.minecraft.recipes.AutoCraftingManager;
|
import com.builtbroken.minecraft.recipes.AutoCraftingManager;
|
||||||
import com.builtbroken.minecraft.recipes.AutoCraftingManager.IAutoCrafter;
|
import com.builtbroken.minecraft.recipes.AutoCraftingManager.IAutoCrafter;
|
||||||
|
@ -344,42 +339,6 @@ public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInv
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Gets all valid inventories that imprinter can use for resources */
|
|
||||||
private IInventory[] getAvaliableInventories()
|
|
||||||
{
|
|
||||||
IInventory[] inventories = new IInventory[6];
|
|
||||||
|
|
||||||
if (this.searchInventories)
|
|
||||||
{
|
|
||||||
for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
|
|
||||||
{
|
|
||||||
TileEntity tileEntity = VectorHelper.getTileEntityFromSide(this.worldObj, new Vector3(this), direction);
|
|
||||||
|
|
||||||
if (tileEntity != null)
|
|
||||||
{
|
|
||||||
if (tileEntity instanceof TileEntityMulti)
|
|
||||||
{
|
|
||||||
Vector3 mainBlockPosition = ((TileEntityMulti) tileEntity).mainBlockPosition;
|
|
||||||
|
|
||||||
if (mainBlockPosition != null)
|
|
||||||
{
|
|
||||||
if (mainBlockPosition.getTileEntity(this.worldObj) instanceof IInventory)
|
|
||||||
{
|
|
||||||
inventories[direction.ordinal()] = ((IInventory) mainBlockPosition.getTileEntity(this.worldObj));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (tileEntity instanceof IInventory && !(tileEntity instanceof TileEntityImprinter))
|
|
||||||
{
|
|
||||||
inventories[direction.ordinal()] = ((IInventory) tileEntity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return inventories;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Tries to let the Armbot craft an item. */
|
/** Tries to let the Armbot craft an item. */
|
||||||
@Override
|
@Override
|
||||||
public boolean onUse(IArmbot armbot, List<ArgumentData> data)
|
public boolean onUse(IArmbot armbot, List<ArgumentData> data)
|
||||||
|
|
|
@ -11,7 +11,6 @@ import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import com.builtbroken.assemblyline.ALRecipeLoader;
|
import com.builtbroken.assemblyline.ALRecipeLoader;
|
||||||
import com.builtbroken.assemblyline.blocks.BlockAssembly;
|
|
||||||
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
|
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
|
||||||
import com.builtbroken.common.Pair;
|
import com.builtbroken.common.Pair;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package com.builtbroken.assemblyline.redstone;
|
package com.builtbroken.assemblyline.redstone;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import universalelectricity.api.vector.Vector3;
|
import universalelectricity.api.vector.Vector3;
|
||||||
|
|
||||||
import com.builtbroken.minecraft.interfaces.IMultiBlock;
|
import com.builtbroken.minecraft.interfaces.IMultiBlock;
|
||||||
|
@ -13,24 +11,10 @@ public class TileEntityPistonPlus extends TileEntityMachine implements IMultiBlo
|
||||||
boolean isExtended = false;
|
boolean isExtended = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActivated(EntityPlayer entityPlayer)
|
public Vector3[] getMultiBlockVectors()
|
||||||
{
|
{
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return null;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Vector3 placedPosition)
|
|
||||||
{
|
|
||||||
//Don't do anything here as we will handle this in the update area
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy(TileEntity callingBlock)
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue