From aee3eb08a6b2663f698a6b9469fc530e2190f3ad Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 20 Dec 2013 04:54:37 -0500 Subject: [PATCH] moved and renamed a few files --- src/com/builtbroken/assemblyline/ALRecipeLoader.java | 1 + src/com/builtbroken/assemblyline/AssemblyLine.java | 3 ++- src/com/builtbroken/assemblyline/armbot/BlockArmbot.java | 2 +- .../assemblyline/{machine => blocks}/BlockAssembly.java | 3 ++- .../{machine/BlockFM.java => blocks/BlockHydraulic.java} | 6 +++--- .../assemblyline/client/render/ItemPipeRenderer.java | 2 +- .../builtbroken/assemblyline/client/render/RenderPipe.java | 2 +- src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java | 5 ++--- .../assemblyline/{ => fluid/pipes}/FluidPartsMaterial.java | 3 ++- .../builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java | 1 - .../assemblyline/fluid/pipes/TileEntityPipe.java | 1 - .../fluid/prefab/TileEntityFluidNetworkTile.java | 2 +- .../assemblyline/fluid/pump/BlockConstructionPump.java | 4 ++-- src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java | 4 ++-- .../assemblyline/fluid/pump/BlockPumpMachine.java | 4 ++-- .../builtbroken/assemblyline/imprinter/BlockImprinter.java | 2 +- .../assemblyline/imprinter/prefab/BlockImprintable.java | 2 +- src/com/builtbroken/assemblyline/machine/BlockCrate.java | 1 + .../assemblyline/machine/BlockMechanicalGenerator.java | 3 ++- .../builtbroken/assemblyline/machine/BlockReleaseValve.java | 1 + src/com/builtbroken/assemblyline/machine/BlockRod.java | 3 ++- src/com/builtbroken/assemblyline/machine/BlockSink.java | 3 ++- .../builtbroken/assemblyline/machine/BlockSteamPiston.java | 3 ++- src/com/builtbroken/assemblyline/machine/BlockTank.java | 5 +++-- .../builtbroken/assemblyline/machine/BlockTurntable.java | 1 + .../assemblyline/machine/belt/BlockConveyor.java | 2 +- .../assemblyline/machine/belt/BlockConveyorBelt.java | 2 +- .../assemblyline/machine/encoder/BlockEncoder.java | 2 +- 28 files changed, 41 insertions(+), 32 deletions(-) rename src/com/builtbroken/assemblyline/{machine => blocks}/BlockAssembly.java (91%) rename src/com/builtbroken/assemblyline/{machine/BlockFM.java => blocks/BlockHydraulic.java} (67%) rename src/com/builtbroken/assemblyline/{ => fluid/pipes}/FluidPartsMaterial.java (98%) diff --git a/src/com/builtbroken/assemblyline/ALRecipeLoader.java b/src/com/builtbroken/assemblyline/ALRecipeLoader.java index f1653bc93..f409f3205 100644 --- a/src/com/builtbroken/assemblyline/ALRecipeLoader.java +++ b/src/com/builtbroken/assemblyline/ALRecipeLoader.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/AssemblyLine.java b/src/com/builtbroken/assemblyline/AssemblyLine.java index 6293f2055..cfccd48c1 100644 --- a/src/com/builtbroken/assemblyline/AssemblyLine.java +++ b/src/com/builtbroken/assemblyline/AssemblyLine.java @@ -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 { diff --git a/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java b/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java index 7b6c03d51..b7d1bcf0d 100644 --- a/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java +++ b/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/BlockAssembly.java b/src/com/builtbroken/assemblyline/blocks/BlockAssembly.java similarity index 91% rename from src/com/builtbroken/assemblyline/machine/BlockAssembly.java rename to src/com/builtbroken/assemblyline/blocks/BlockAssembly.java index 527f99755..ff54c37af 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockAssembly.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockAssembly.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/BlockFM.java b/src/com/builtbroken/assemblyline/blocks/BlockHydraulic.java similarity index 67% rename from src/com/builtbroken/assemblyline/machine/BlockFM.java rename to src/com/builtbroken/assemblyline/blocks/BlockHydraulic.java index b4ffea211..79808df5e 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockFM.java +++ b/src/com/builtbroken/assemblyline/blocks/BlockHydraulic.java @@ -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()); diff --git a/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java b/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java index 216cff3d4..883cc46d0 100644 --- a/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java +++ b/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/client/render/RenderPipe.java b/src/com/builtbroken/assemblyline/client/render/RenderPipe.java index 59c59b45b..ba0040a8b 100644 --- a/src/com/builtbroken/assemblyline/client/render/RenderPipe.java +++ b/src/com/builtbroken/assemblyline/client/render/RenderPipe.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java b/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java index 172206107..be57a2d97 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/FluidPartsMaterial.java b/src/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java similarity index 98% rename from src/com/builtbroken/assemblyline/FluidPartsMaterial.java rename to src/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java index 844f6a769..50fd27c49 100644 --- a/src/com/builtbroken/assemblyline/FluidPartsMaterial.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java b/src/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java index f58c41d53..dcf10c246 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java b/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java index 4402811b9..0b504e2a5 100644 --- a/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java +++ b/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java index 935039023..b075ba4ec 100644 --- a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java +++ b/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java b/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java index ac6dbc402..a8536bf08 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java @@ -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() diff --git a/src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java b/src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java index 3c3bfd7e8..b1743f322 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java b/src/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java index 2d52a144f..44b6f3f48 100644 --- a/src/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java +++ b/src/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java @@ -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() diff --git a/src/com/builtbroken/assemblyline/imprinter/BlockImprinter.java b/src/com/builtbroken/assemblyline/imprinter/BlockImprinter.java index bcaf2ed9e..cf7fe9209 100644 --- a/src/com/builtbroken/assemblyline/imprinter/BlockImprinter.java +++ b/src/com/builtbroken/assemblyline/imprinter/BlockImprinter.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java b/src/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java index 157af8df3..06c8de406 100644 --- a/src/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java +++ b/src/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java @@ -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. * diff --git a/src/com/builtbroken/assemblyline/machine/BlockCrate.java b/src/com/builtbroken/assemblyline/machine/BlockCrate.java index c0569d708..97abe93e8 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockCrate.java +++ b/src/com/builtbroken/assemblyline/machine/BlockCrate.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java b/src/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java index 8241ce1d7..d01c81100 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java +++ b/src/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java @@ -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() diff --git a/src/com/builtbroken/assemblyline/machine/BlockReleaseValve.java b/src/com/builtbroken/assemblyline/machine/BlockReleaseValve.java index 299027f85..7021e52d3 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockReleaseValve.java +++ b/src/com/builtbroken/assemblyline/machine/BlockReleaseValve.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/BlockRod.java b/src/com/builtbroken/assemblyline/machine/BlockRod.java index 8fc45c1b0..cda810df2 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockRod.java +++ b/src/com/builtbroken/assemblyline/machine/BlockRod.java @@ -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() diff --git a/src/com/builtbroken/assemblyline/machine/BlockSink.java b/src/com/builtbroken/assemblyline/machine/BlockSink.java index 37ee20e9d..e1307291b 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockSink.java +++ b/src/com/builtbroken/assemblyline/machine/BlockSink.java @@ -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() { diff --git a/src/com/builtbroken/assemblyline/machine/BlockSteamPiston.java b/src/com/builtbroken/assemblyline/machine/BlockSteamPiston.java index 2bc218040..a782a43f8 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockSteamPiston.java +++ b/src/com/builtbroken/assemblyline/machine/BlockSteamPiston.java @@ -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() diff --git a/src/com/builtbroken/assemblyline/machine/BlockTank.java b/src/com/builtbroken/assemblyline/machine/BlockTank.java index eba5ce065..b8f43bcb9 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockTank.java +++ b/src/com/builtbroken/assemblyline/machine/BlockTank.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/BlockTurntable.java b/src/com/builtbroken/assemblyline/machine/BlockTurntable.java index 1ff74382a..12cfe285e 100644 --- a/src/com/builtbroken/assemblyline/machine/BlockTurntable.java +++ b/src/com/builtbroken/assemblyline/machine/BlockTurntable.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java b/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java index 06a94325f..dd36dd029 100644 --- a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java +++ b/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java b/src/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java index 91440f652..939fd965f 100644 --- a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java +++ b/src/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java @@ -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; diff --git a/src/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java b/src/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java index fae7d7a96..43640f9cf 100644 --- a/src/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java +++ b/src/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java @@ -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;