Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

moved and renamed a few files

Browse source
This commit is contained in:
Robert 2013-12-20 04:54:37 -05:00
parent 45b7980d67
commit aee3eb08a6
28 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/builtbroken/assemblyline/ALRecipeLoader.java
View file

@ -12,6 +12,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import com.builtbroken.assemblyline.blocks.BlockBasalt;
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
import com.builtbroken.assemblyline.generators.BlockSolarPanel;
import com.builtbroken.assemblyline.item.EnumTool;
import com.builtbroken.assemblyline.item.ItemCommonTool;

3
src/com/builtbroken/assemblyline/AssemblyLine.java
View file

@ -53,6 +53,7 @@ import com.builtbroken.assemblyline.entities.EnumBird;
import com.builtbroken.assemblyline.entities.prefab.EntityTestCar;
import com.builtbroken.assemblyline.entities.prefab.ItemVehicleSpawn;
import com.builtbroken.assemblyline.fluid.pipes.BlockPipe;
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
import com.builtbroken.assemblyline.fluid.pipes.ItemBlockPipe;
import com.builtbroken.assemblyline.fluid.pump.BlockConstructionPump;
import com.builtbroken.assemblyline.fluid.pump.BlockDrain;
@ -118,7 +119,7 @@ import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
@ModstatInfo(prefix = "asmline")
@Mod(modid = AssemblyLine.MOD_ID, name = AssemblyLine.MOD_NAME, version = AssemblyLine.VERSION, dependencies = "required-after:DarkCore", useMetadata = true)
@Mod(modid = AssemblyLine.MOD_ID, name = AssemblyLine.MOD_NAME, version = AssemblyLine.VERSION, useMetadata = true)
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
public class AssemblyLine
{

2
src/com/builtbroken/assemblyline/armbot/BlockArmbot.java
View file

@ -12,9 +12,9 @@ import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
import com.builtbroken.assemblyline.client.render.RenderArmbot;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.interfaces.IMultiBlock;

3
src/com/builtbroken/assemblyline/machine/BlockAssembly.java → src/com/builtbroken/assemblyline/blocks/BlockAssembly.java
View file

@ -1,4 +1,4 @@
package com.builtbroken.assemblyline.machine;
package com.builtbroken.assemblyline.blocks;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
@ -7,6 +7,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.machine.TileEntityAssembly;
import com.builtbroken.minecraft.IndustryTabs;
import com.builtbroken.minecraft.prefab.BlockMachine;

6
src/com/builtbroken/assemblyline/machine/BlockFM.java → src/com/builtbroken/assemblyline/blocks/BlockHydraulic.java
View file

@ -1,4 +1,4 @@
package com.builtbroken.assemblyline.machine;
package com.builtbroken.assemblyline.blocks;
import net.minecraft.block.material.Material;
@ -6,10 +6,10 @@ import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.minecraft.IndustryTabs;
import com.builtbroken.minecraft.prefab.BlockMachine;
public abstract class BlockFM extends BlockMachine
public abstract class BlockHydraulic extends BlockMachine
{
public BlockFM(String name, Material material)
public BlockHydraulic(String name, Material material)
{
super(AssemblyLine.CONFIGURATION, name, material);
this.setCreativeTab(IndustryTabs.tabHydraulic());

2
src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java
View file

@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.client.model.ModelReleaseValve;
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
import com.builtbroken.minecraft.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;

2
src/com/builtbroken/assemblyline/client/render/RenderPipe.java
View file

@ -9,9 +9,9 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.client.model.ModelLargePipe;
import com.builtbroken.assemblyline.fluid.pipes.EnumPipeType;
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.DarkCore;

5
src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java
View file

@ -18,8 +18,7 @@ import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidTankInfo;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.machine.BlockFM;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.helpers.ColorCode;
import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;
@ -27,7 +26,7 @@ import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockPipe extends BlockFM
public class BlockPipe extends BlockHydraulic
{
public static int waterFlowRate = 3000;

3
src/com/builtbroken/assemblyline/FluidPartsMaterial.java → src/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java
View file

@ -1,4 +1,4 @@
package com.builtbroken.assemblyline;
package com.builtbroken.assemblyline.fluid.pipes;
import java.util.ArrayList;
import java.util.List;
@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import com.builtbroken.minecraft.helpers.ColorCode;

1
src/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java
View file

@ -17,7 +17,6 @@ import net.minecraftforge.fluids.FluidStack;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;
import com.builtbroken.assemblyline.machine.TileEntityTank;

1
src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java
View file

@ -7,7 +7,6 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.api.fluid.INetworkPipe;
import com.builtbroken.assemblyline.fluid.network.NetworkPipes;
import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile;

2
src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java
View file

@ -22,10 +22,10 @@ import org.bouncycastle.util.Arrays;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.api.fluid.FluidMasterList;
import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart;
import com.builtbroken.assemblyline.fluid.network.NetworkFluidTiles;
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
import com.builtbroken.minecraft.DarkCore;
import com.builtbroken.minecraft.network.ISimplePacketReceiver;
import com.builtbroken.minecraft.network.PacketHandler;

4
src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java
View file

@ -16,15 +16,15 @@ import net.minecraft.world.World;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.assemblyline.machine.BlockFM;
import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockConstructionPump extends BlockFM
public class BlockConstructionPump extends BlockHydraulic
{
public BlockConstructionPump()

4
src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java
View file

@ -16,10 +16,10 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.machine.BlockFM;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.common.Pair;
public class BlockDrain extends BlockFM
public class BlockDrain extends BlockHydraulic
{
private Icon blockIcon;
private Icon drainIcon;

4
src/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java
View file

@ -12,14 +12,14 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.assemblyline.machine.BlockFM;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockPumpMachine extends BlockFM
public class BlockPumpMachine extends BlockHydraulic
{
public BlockPumpMachine()

2
src/com/builtbroken/assemblyline/imprinter/BlockImprinter.java
View file

@ -16,7 +16,7 @@ import net.minecraft.world.World;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.CommonProxy;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;

2
src/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java
View file

@ -10,8 +10,8 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.api.IFilterable;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.assemblyline.imprinter.ItemImprinter;
import com.builtbroken.assemblyline.machine.BlockAssembly;
/** Extend this block class if a filter is allowed to be placed inside of this block.
*

1
src/com/builtbroken/assemblyline/machine/BlockCrate.java
View file

@ -18,6 +18,7 @@ import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.assemblyline.client.render.RenderCrate;
import com.builtbroken.common.Pair;

3
src/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java
View file

@ -13,13 +13,14 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockMechanicalGenerator extends BlockFM
public class BlockMechanicalGenerator extends BlockHydraulic
{
public BlockMechanicalGenerator()

1
src/com/builtbroken/assemblyline/machine/BlockReleaseValve.java
View file

@ -11,6 +11,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;

3
src/com/builtbroken/assemblyline/machine/BlockRod.java
View file

@ -13,13 +13,14 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.assemblyline.ALRecipeLoader;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockRod extends BlockFM
public class BlockRod extends BlockHydraulic
{
public BlockRod()

3
src/com/builtbroken/assemblyline/machine/BlockSink.java
View file

@ -12,6 +12,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.fluid.FluidHelper;
@ -19,7 +20,7 @@ import com.builtbroken.minecraft.fluid.FluidHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockSink extends BlockFM
public class BlockSink extends BlockHydraulic
{
public BlockSink()
{

3
src/com/builtbroken/assemblyline/machine/BlockSteamPiston.java
View file

@ -9,12 +9,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockSteamPiston extends BlockFM
public class BlockSteamPiston extends BlockHydraulic
{
public BlockSteamPiston()

5
src/com/builtbroken/assemblyline/machine/BlockTank.java
View file

@ -14,8 +14,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.assemblyline.FluidPartsMaterial;
import com.builtbroken.assemblyline.blocks.BlockHydraulic;
import com.builtbroken.assemblyline.client.render.BlockRenderHelper;
import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial;
import com.builtbroken.assemblyline.fluid.pipes.ItemBlockPipe;
import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe;
import com.builtbroken.common.Pair;
@ -25,7 +26,7 @@ import com.builtbroken.minecraft.helpers.DarksHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockTank extends BlockFM
public class BlockTank extends BlockHydraulic
{
public static int tankVolume = 16;

1
src/com/builtbroken/assemblyline/machine/BlockTurntable.java
View file

@ -18,6 +18,7 @@ import universalelectricity.prefab.block.IRotatableBlock;
import universalelectricity.prefab.tile.IRotatable;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java
View file

@ -15,9 +15,9 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
import com.builtbroken.assemblyline.client.render.RenderConveyorBelt;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType;
import com.builtbroken.common.Pair;
import com.builtbroken.minecraft.tilenetwork.prefab.NetworkItemSupply;

2
src/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java
View file

@ -18,9 +18,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.assemblyline.client.render.BlockRenderingHandler;
import com.builtbroken.assemblyline.client.render.RenderConveyorBelt;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType;
import com.builtbroken.common.Pair;

2
src/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java
View file

@ -12,7 +12,7 @@ import net.minecraft.world.World;
import com.builtbroken.assemblyline.AssemblyLine;
import com.builtbroken.assemblyline.CommonProxy;
import com.builtbroken.assemblyline.machine.BlockAssembly;
import com.builtbroken.assemblyline.blocks.BlockAssembly;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;