diff --git a/buildcraft_resources/gfx/buildcraft/logo.png b/buildcraft_resources/assets/buildcraft/logo.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/logo.png rename to buildcraft_resources/assets/buildcraft/logo.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_bottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_bottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_bottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_bottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/architect_front.png b/buildcraft_resources/assets/buildcraft/textures/blocks/architect_front.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/architect_front.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/architect_front.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/architect_sides.png b/buildcraft_resources/assets/buildcraft/textures/blocks/architect_sides.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/architect_sides.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/architect_sides.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/architect_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/architect_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/architect_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/architect_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_neg.png b/buildcraft_resources/assets/buildcraft/textures/blocks/architect_top_neg.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_neg.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/architect_top_neg.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_pos.png b/buildcraft_resources/assets/buildcraft/textures/blocks/architect_top_pos.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_pos.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/architect_top_pos.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_bottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_bottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_bottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_bottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_top.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/base_iron.png b/buildcraft_resources/assets/buildcraft/textures/blocks/base_iron.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/base_iron.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/base_iron.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/base_stone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/base_stone.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/base_stone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/base_stone.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/base_wood.png b/buildcraft_resources/assets/buildcraft/textures/blocks/base_wood.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/base_wood.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/base_wood.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockBlueLaser.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockBlueLaser.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockBlueLaser.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockBlueLaser.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillHeadTexture.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillHeadTexture.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillHeadTexture.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillHeadTexture.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillTexture.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillTexture.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillTexture.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillTexture.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerSides.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerSides.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerSides.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerSides.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerTopOff.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOff.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerTopOff.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOff.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerTopOn.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOn.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerTopOn.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOn.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockFrame.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockFrame.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockFrame.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockFrame.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockMarker.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockMarker.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockMarker.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockMarker.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarker.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarker.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarker.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarker.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarkerActive.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarkerActive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarkerActive.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarkerActive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockPlainPipe.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockPlainPipe.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockPlainPipe.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockPlainPipe.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockRedLaser.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockRedLaser.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockRedLaser.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockRedLaser.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockStripesLaser.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockStripesLaser.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockStripesLaser.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockStripesLaser.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockTransparentLaser.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockTransparentLaser.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/blockTransparentLaser.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/blockTransparentLaser.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_13.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_12_13.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_12_13.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_12_13.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_14.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_12_14.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_12_14.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_12_14.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_15.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_12_15.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_12_15.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_12_15.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_14.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_13_14.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_13_14.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_13_14.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_15.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_13_15.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_13_15.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_13_15.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_0.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_0.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_1.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_1.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_2.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_2.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_3.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_3.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_4.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_4.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_5.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_5.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_5.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_5.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_6.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_6.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_6.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_6.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_7.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_7.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_7.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_7.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_8.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_8.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_8.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_8.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_9.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_15_9.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_15_9.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_15_9.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_4.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_1_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_4.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_1_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_0.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_0.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_1.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_1.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_10.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_10.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_10.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_10.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_11.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_11.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_11.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_11.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_12.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_12.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_12.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_12.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_13.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_13.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_13.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_13.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_14.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_14.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_14.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_14.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_15.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_15.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_15.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_15.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_2.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_2.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_3.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_3.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_4.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_4.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_5.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_5.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_5.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_5.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_6.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_6.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_6.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_6.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_7.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_7.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_7.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_7.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_8.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_8.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_8.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_8.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_9.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_5_9.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_5_9.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_5_9.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_11.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_7_11.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_11.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_7_11.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_12.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_7_12.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_12.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_7_12.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_15.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_7_15.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_15.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_7_15.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_5.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_7_5.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_5.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_7_5.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_7.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_7_7.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_7.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_7_7.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_9.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_7_9.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_9.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_7_9.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_0.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_8_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_0.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_8_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_1.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_8_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_1.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_8_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_2.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_8_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_2.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_8_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_3.png b/buildcraft_resources/assets/buildcraft/textures/blocks/block_8_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_3.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/block_8_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/builder_front.png b/buildcraft_resources/assets/buildcraft/textures/blocks/builder_front.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/builder_front.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/builder_front.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/builder_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/builder_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/builder_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/builder_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/builder_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/builder_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/builder_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/builder_top.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/chamber.png b/buildcraft_resources/assets/buildcraft/textures/blocks/chamber.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/chamber.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/chamber.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineIronBottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronBottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineIronBottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineIronBottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineIronSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronSide.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineIronSide.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineIronSide.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineIronTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronTop.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineIronTop.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineIronTop.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineStoneBottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneBottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineStoneBottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneBottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineStoneSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneSide.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineStoneSide.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneSide.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineStoneTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneTop.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineStoneTop.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneTop.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineWoodBottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodBottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineWoodBottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodBottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineWoodSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodSide.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineWoodSide.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodSide.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/engineWoodTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodTop.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/engineWoodTop.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodTop.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/clear.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/clear.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/clear.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/clear.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/fillAll.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/fillAll.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/fillAll.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/fillAll.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/flatten.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/flatten.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/flatten.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/flatten.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/horizon.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/horizon.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/horizon.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/horizon.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/pyramid.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/pyramid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/pyramid.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/pyramid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/stairs.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/stairs.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/stairs.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/stairs.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/walls.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/walls.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/walls.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/walls.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/filteredBuffer_all.png b/buildcraft_resources/assets/buildcraft/textures/blocks/filteredBuffer_all.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/filteredBuffer_all.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/filteredBuffer_all.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/fuel.png b/buildcraft_resources/assets/buildcraft/textures/blocks/fuel.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/fuel.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/fuel.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fuel.png.mcmeta b/buildcraft_resources/assets/buildcraft/textures/blocks/fuel.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/buildcraft_resources/assets/buildcraft/textures/blocks/fuel.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_diamond_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_gold_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_iron_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_autarchic_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_diamond_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_gold_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_iron_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/gate_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/gate_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/gate_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/gate_lit.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/hopper.png b/buildcraft_resources/assets/buildcraft/textures/blocks/hopper.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/hopper.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/hopper.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/hopperBottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/hopperBottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/hopperBottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/hopperBottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/hopperSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/hopperSide.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/hopperSide.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/hopperSide.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/hopperTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/hopperTop.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/hopperTop.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/hopperTop.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/hopper_middle.png b/buildcraft_resources/assets/buildcraft/textures/blocks/hopper_middle.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/hopper_middle.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/hopper_middle.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/laser_bottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/laser_bottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/laser_bottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/laser_bottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/laser_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/laser_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/laser_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/laser_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/laser_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/laser_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/laser_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/laser_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/library_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/library_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/library_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/library_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/library_topbottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/library_topbottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/library_topbottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/library_topbottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_back.png b/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_back.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_back.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_back.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_front.png b/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_front.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_front.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_front.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/miningwell_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil.png b/buildcraft_resources/assets/buildcraft/textures/blocks/oil.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/oil.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/oil.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/oil.png.mcmeta b/buildcraft_resources/assets/buildcraft/textures/blocks/oil.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/buildcraft_resources/assets/buildcraft/textures/blocks/oil.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.png b/buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png.mcmeta b/buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllEmerald_solid.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllEmerald_solid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllEmerald_solid.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllEmerald_solid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllIron_solid.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllIron_solid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllIron_solid.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllIron_solid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllWood_solid.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllWood_solid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllWood_solid.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllWood_solid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsCobblestone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsCobblestone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsCobblestone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsEmerald_standard.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsEmerald_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsEmerald_standard.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsEmerald_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsGold.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsGold.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsGold.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsGold.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsIron_standard.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsIron_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsIron_standard.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsIron_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsSandstone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsSandstone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsSandstone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsSandstone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsStone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsStone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsStone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsStone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsVoid.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsVoid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsVoid.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsVoid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsWood_standard.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsWood_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsWood_standard.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsWood_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsCobblestone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsCobblestone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsCobblestone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_center.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_center.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_center.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_center.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_down.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_down.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_down.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_down.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_east.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_east.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_east.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_east.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_north.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_north.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_north.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_north.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_south.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_south.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_south.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_south.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_up.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_up.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_up.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_up.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_west.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_west.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_west.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_west.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsEmerald_standard.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsEmerald_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsEmerald_standard.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsEmerald_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsGold.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsGold.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsGold.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsGold.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsIron_standard.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsIron_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsIron_standard.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsIron_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsObsidian.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsObsidian.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsObsidian.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsObsidian.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsQuartz.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsQuartz.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsQuartz.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsQuartz.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsSandstone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsSandstone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsSandstone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsSandstone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsStone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsStone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsStone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsStone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsVoid.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsVoid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsVoid.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsVoid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsWood_standard.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsWood_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsWood_standard.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsWood_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerCobblestone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerCobblestone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerCobblestone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerDiamond.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerDiamond.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerDiamond.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerDiamond.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerGold.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerGold.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerGold.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerGold.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerQuartz.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerQuartz.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerQuartz.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerQuartz.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerStone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerStone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerStone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerStone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerWood_standard.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerWood_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerWood_standard.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerWood_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeStripes.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeStripes.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeStripes.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeStripes.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeStructureCobblestone.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pipeStructureCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pipeStructureCobblestone.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pipeStructureCobblestone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pump_bottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pump_bottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pump_bottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pump_bottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pump_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pump_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pump_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pump_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pump_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pump_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pump_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pump_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pump_tube.png b/buildcraft_resources/assets/buildcraft/textures/blocks/pump_tube.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/pump_tube.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/pump_tube.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/quarry_front.png b/buildcraft_resources/assets/buildcraft/textures/blocks/quarry_front.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/quarry_front.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/quarry_front.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/quarry_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/quarry_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/quarry_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/quarry_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/quarry_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/quarry_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/quarry_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/quarry_top.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/refinery.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refinery.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/refinery.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/refinery.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/refineryBack.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryBack.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/refineryBack.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/refineryBack.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/refineryBottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryBottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/refineryBottom.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/refineryBottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/refineryEast.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryEast.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/refineryEast.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/refineryEast.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/refineryFront.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryFront.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/refineryFront.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/refineryFront.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/refineryTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryTop.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/refineryTop.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/refineryTop.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/refineryWest.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryWest.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/refineryWest.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/refineryWest.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/tank_bottom_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/tank_bottom_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/tank_bottom_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/tank_bottom_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/tank_stacked_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/tank_stacked_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/tank_stacked_side.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/tank_stacked_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/tank_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/tank_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/tank_top.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/tank_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_cyan.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_cyan.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_cyan.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_cyan.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_dark.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_dark.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_lit.png b/buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_lit.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_lit.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/trunk_blue.png b/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_blue.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/trunk_blue.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/trunk_blue.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/trunk_green.png b/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_green.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/trunk_green.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/trunk_green.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/trunk_red.png b/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_red.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/trunk_red.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/trunk_red.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/trunk_yellow.png b/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_yellow.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/blocks/trunk_yellow.png rename to buildcraft_resources/assets/buildcraft/textures/blocks/trunk_yellow.png diff --git a/buildcraft_resources/gfx/buildcraft/entities/laser_1.png b/buildcraft_resources/assets/buildcraft/textures/entities/laser_1.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/entities/laser_1.png rename to buildcraft_resources/assets/buildcraft/textures/entities/laser_1.png diff --git a/buildcraft_resources/gfx/buildcraft/entities/laser_2.png b/buildcraft_resources/assets/buildcraft/textures/entities/laser_2.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/entities/laser_2.png rename to buildcraft_resources/assets/buildcraft/textures/entities/laser_2.png diff --git a/buildcraft_resources/gfx/buildcraft/entities/laser_3.png b/buildcraft_resources/assets/buildcraft/textures/entities/laser_3.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/entities/laser_3.png rename to buildcraft_resources/assets/buildcraft/textures/entities/laser_3.png diff --git a/buildcraft_resources/gfx/buildcraft/entities/laser_4.png b/buildcraft_resources/assets/buildcraft/textures/entities/laser_4.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/entities/laser_4.png rename to buildcraft_resources/assets/buildcraft/textures/entities/laser_4.png diff --git a/buildcraft_resources/gfx/buildcraft/entities/robot.png b/buildcraft_resources/assets/buildcraft/textures/entities/robot.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/entities/robot.png rename to buildcraft_resources/assets/buildcraft/textures/entities/robot.png diff --git a/buildcraft_resources/gfx/buildcraft/entities/stripes.png b/buildcraft_resources/assets/buildcraft/textures/entities/stripes.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/entities/stripes.png rename to buildcraft_resources/assets/buildcraft/textures/entities/stripes.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/assembly_advancedworkbench.png b/buildcraft_resources/assets/buildcraft/textures/gui/assembly_advancedworkbench.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/assembly_advancedworkbench.png rename to buildcraft_resources/assets/buildcraft/textures/gui/assembly_advancedworkbench.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/assembly_table.png b/buildcraft_resources/assets/buildcraft/textures/gui/assembly_table.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/assembly_table.png rename to buildcraft_resources/assets/buildcraft/textures/gui/assembly_table.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/autobench.png b/buildcraft_resources/assets/buildcraft/textures/gui/autobench.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/autobench.png rename to buildcraft_resources/assets/buildcraft/textures/gui/autobench.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/builder.png b/buildcraft_resources/assets/buildcraft/textures/gui/builder.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/builder.png rename to buildcraft_resources/assets/buildcraft/textures/gui/builder.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/builder_blueprint.png b/buildcraft_resources/assets/buildcraft/textures/gui/builder_blueprint.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/builder_blueprint.png rename to buildcraft_resources/assets/buildcraft/textures/gui/builder_blueprint.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/buttons.png b/buildcraft_resources/assets/buildcraft/textures/gui/buttons.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/buttons.png rename to buildcraft_resources/assets/buildcraft/textures/gui/buttons.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/combustion_engine_gui.png b/buildcraft_resources/assets/buildcraft/textures/gui/combustion_engine_gui.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/combustion_engine_gui.png rename to buildcraft_resources/assets/buildcraft/textures/gui/combustion_engine_gui.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/filler.png b/buildcraft_resources/assets/buildcraft/textures/gui/filler.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/filler.png rename to buildcraft_resources/assets/buildcraft/textures/gui/filler.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/filter.png b/buildcraft_resources/assets/buildcraft/textures/gui/filter.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/filter.png rename to buildcraft_resources/assets/buildcraft/textures/gui/filter.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/filter_2.png b/buildcraft_resources/assets/buildcraft/textures/gui/filter_2.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/filter_2.png rename to buildcraft_resources/assets/buildcraft/textures/gui/filter_2.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/filteredBuffer_gui.png b/buildcraft_resources/assets/buildcraft/textures/gui/filteredBuffer_gui.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/filteredBuffer_gui.png rename to buildcraft_resources/assets/buildcraft/textures/gui/filteredBuffer_gui.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/gate_interface_1.png b/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_1.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/gate_interface_1.png rename to buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_1.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/gate_interface_2.png b/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_2.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/gate_interface_2.png rename to buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_2.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/gate_interface_3.png b/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_3.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/gate_interface_3.png rename to buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_3.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/gate_interface_4.png b/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_4.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/gate_interface_4.png rename to buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_4.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/hopper_gui.png b/buildcraft_resources/assets/buildcraft/textures/gui/hopper_gui.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/hopper_gui.png rename to buildcraft_resources/assets/buildcraft/textures/gui/hopper_gui.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/icons.png b/buildcraft_resources/assets/buildcraft/textures/gui/icons.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/icons.png rename to buildcraft_resources/assets/buildcraft/textures/gui/icons.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/ledger.png b/buildcraft_resources/assets/buildcraft/textures/gui/ledger.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/ledger.png rename to buildcraft_resources/assets/buildcraft/textures/gui/ledger.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/library_r.png b/buildcraft_resources/assets/buildcraft/textures/gui/library_r.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/library_r.png rename to buildcraft_resources/assets/buildcraft/textures/gui/library_r.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/library_rw.png b/buildcraft_resources/assets/buildcraft/textures/gui/library_rw.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/library_rw.png rename to buildcraft_resources/assets/buildcraft/textures/gui/library_rw.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/refinery_filter.png b/buildcraft_resources/assets/buildcraft/textures/gui/refinery_filter.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/refinery_filter.png rename to buildcraft_resources/assets/buildcraft/textures/gui/refinery_filter.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/steam_engine_gui.png b/buildcraft_resources/assets/buildcraft/textures/gui/steam_engine_gui.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/steam_engine_gui.png rename to buildcraft_resources/assets/buildcraft/textures/gui/steam_engine_gui.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/template_gui.png b/buildcraft_resources/assets/buildcraft/textures/gui/template_gui.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/template_gui.png rename to buildcraft_resources/assets/buildcraft/textures/gui/template_gui.png diff --git a/buildcraft_resources/gfx/buildcraft/gui/triggers.png b/buildcraft_resources/assets/buildcraft/textures/gui/triggers.png similarity index 100% rename from buildcraft_resources/gfx/buildcraft/gui/triggers.png rename to buildcraft_resources/assets/buildcraft/textures/gui/triggers.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate.png b/buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate.png rename to buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_and.png b/buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_diamond_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_and.png rename to buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_diamond_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_or.png b/buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_diamond_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_or.png rename to buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_diamond_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_and.png b/buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_gold_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_and.png rename to buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_gold_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_or.png b/buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_gold_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_or.png rename to buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_gold_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_and.png b/buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_iron_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_and.png rename to buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_iron_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_or.png b/buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_iron_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_or.png rename to buildcraft_resources/assets/buildcraft/textures/items/autarchic_gate_iron_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_0.png b/buildcraft_resources/assets/buildcraft/textures/items/block_0_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_0_0.png rename to buildcraft_resources/assets/buildcraft/textures/items/block_0_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/bluePipeWire.png b/buildcraft_resources/assets/buildcraft/textures/items/bluePipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/bluePipeWire.png rename to buildcraft_resources/assets/buildcraft/textures/items/bluePipeWire.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/blueprint_clean.png b/buildcraft_resources/assets/buildcraft/textures/items/blueprint_clean.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/blueprint_clean.png rename to buildcraft_resources/assets/buildcraft/textures/items/blueprint_clean.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/blueprint_used.png b/buildcraft_resources/assets/buildcraft/textures/items/blueprint_used.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/blueprint_used.png rename to buildcraft_resources/assets/buildcraft/textures/items/blueprint_used.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/bucketFuel.png b/buildcraft_resources/assets/buildcraft/textures/items/bucketFuel.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/bucketFuel.png rename to buildcraft_resources/assets/buildcraft/textures/items/bucketFuel.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/oil_bucket.png b/buildcraft_resources/assets/buildcraft/textures/items/bucketOil.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/oil_bucket.png rename to buildcraft_resources/assets/buildcraft/textures/items/bucketOil.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/diamondGearItem.png b/buildcraft_resources/assets/buildcraft/textures/items/diamondGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/diamondGearItem.png rename to buildcraft_resources/assets/buildcraft/textures/items/diamondGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/gate.png b/buildcraft_resources/assets/buildcraft/textures/items/gate.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/gate.png rename to buildcraft_resources/assets/buildcraft/textures/items/gate.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_and.png b/buildcraft_resources/assets/buildcraft/textures/items/gate_diamond_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_and.png rename to buildcraft_resources/assets/buildcraft/textures/items/gate_diamond_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_or.png b/buildcraft_resources/assets/buildcraft/textures/items/gate_diamond_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_or.png rename to buildcraft_resources/assets/buildcraft/textures/items/gate_diamond_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/gate_gold_and.png b/buildcraft_resources/assets/buildcraft/textures/items/gate_gold_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/gate_gold_and.png rename to buildcraft_resources/assets/buildcraft/textures/items/gate_gold_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/gate_gold_or.png b/buildcraft_resources/assets/buildcraft/textures/items/gate_gold_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/gate_gold_or.png rename to buildcraft_resources/assets/buildcraft/textures/items/gate_gold_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/gate_iron_and.png b/buildcraft_resources/assets/buildcraft/textures/items/gate_iron_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/gate_iron_and.png rename to buildcraft_resources/assets/buildcraft/textures/items/gate_iron_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/gate_iron_or.png b/buildcraft_resources/assets/buildcraft/textures/items/gate_iron_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/gate_iron_or.png rename to buildcraft_resources/assets/buildcraft/textures/items/gate_iron_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/goldGearItem.png b/buildcraft_resources/assets/buildcraft/textures/items/goldGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/goldGearItem.png rename to buildcraft_resources/assets/buildcraft/textures/items/goldGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/greenPipeWire.png b/buildcraft_resources/assets/buildcraft/textures/items/greenPipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/greenPipeWire.png rename to buildcraft_resources/assets/buildcraft/textures/items/greenPipeWire.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/icons/energy.png b/buildcraft_resources/assets/buildcraft/textures/items/icons/energy.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/icons/energy.png rename to buildcraft_resources/assets/buildcraft/textures/items/icons/energy.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_1.png b/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_1.png rename to buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_2.png b/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_2.png rename to buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_3.png b/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_3.png rename to buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_4.png b/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_4.png rename to buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/ironGearItem.png b/buildcraft_resources/assets/buildcraft/textures/items/ironGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/ironGearItem.png rename to buildcraft_resources/assets/buildcraft/textures/items/ironGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/pipeWaterproof.png b/buildcraft_resources/assets/buildcraft/textures/items/pipeWaterproof.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/pipeWaterproof.png rename to buildcraft_resources/assets/buildcraft/textures/items/pipeWaterproof.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/redPipeWire.png b/buildcraft_resources/assets/buildcraft/textures/items/redPipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/redPipeWire.png rename to buildcraft_resources/assets/buildcraft/textures/items/redPipeWire.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/redstone_diamond_chipset.png b/buildcraft_resources/assets/buildcraft/textures/items/redstone_diamond_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/redstone_diamond_chipset.png rename to buildcraft_resources/assets/buildcraft/textures/items/redstone_diamond_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/redstone_gold_chipset.png b/buildcraft_resources/assets/buildcraft/textures/items/redstone_gold_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/redstone_gold_chipset.png rename to buildcraft_resources/assets/buildcraft/textures/items/redstone_gold_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/redstone_iron_chipset.png b/buildcraft_resources/assets/buildcraft/textures/items/redstone_iron_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/redstone_iron_chipset.png rename to buildcraft_resources/assets/buildcraft/textures/items/redstone_iron_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/redstone_pulsating_chipset.png b/buildcraft_resources/assets/buildcraft/textures/items/redstone_pulsating_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/redstone_pulsating_chipset.png rename to buildcraft_resources/assets/buildcraft/textures/items/redstone_pulsating_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/redstone_red_chipset.png b/buildcraft_resources/assets/buildcraft/textures/items/redstone_red_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/redstone_red_chipset.png rename to buildcraft_resources/assets/buildcraft/textures/items/redstone_red_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/stoneGearItem.png b/buildcraft_resources/assets/buildcraft/textures/items/stoneGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/stoneGearItem.png rename to buildcraft_resources/assets/buildcraft/textures/items/stoneGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/template_clean.png b/buildcraft_resources/assets/buildcraft/textures/items/template_clean.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/template_clean.png rename to buildcraft_resources/assets/buildcraft/textures/items/template_clean.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/template_used.png b/buildcraft_resources/assets/buildcraft/textures/items/template_used.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/template_used.png rename to buildcraft_resources/assets/buildcraft/textures/items/template_used.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_loop.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_loop.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_loop.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_loop.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_off.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_off.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_off.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_off.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_on.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_on.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_on.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_on.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_4.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_3_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_4.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_3_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_0.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_0.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_1.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_1.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_2.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_2.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_3.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_3.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_4.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_4.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_5.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_5.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_5.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_5_5.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_blue.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_blue.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_blue.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_blue.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_green.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_green.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_green.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_green.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_red.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_red.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_red.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_red.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_below25.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below25.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_below25.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below25.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_below50.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below50.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_below50.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below50.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_below75.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below75.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_below75.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below75.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_contains.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_contains.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_contains.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_contains.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_empty.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_empty.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_empty.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_empty.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_full.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_full.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_full.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_full.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_space.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_space.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_space.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_space.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_active.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_active.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_inactive.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_inactive.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsliquid.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsliquid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsliquid.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsliquid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_requestsenergy.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_requestsenergy.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_requestsenergy.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_requestsenergy.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_toomuchenergy.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_toomuchenergy.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_toomuchenergy.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_toomuchenergy.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png rename to buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/woodenGearItem.png b/buildcraft_resources/assets/buildcraft/textures/items/woodenGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/woodenGearItem.png rename to buildcraft_resources/assets/buildcraft/textures/items/woodenGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/wrenchItem.png b/buildcraft_resources/assets/buildcraft/textures/items/wrenchItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/wrenchItem.png rename to buildcraft_resources/assets/buildcraft/textures/items/wrenchItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/yellowPipeWire.png b/buildcraft_resources/assets/buildcraft/textures/items/yellowPipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/yellowPipeWire.png rename to buildcraft_resources/assets/buildcraft/textures/items/yellowPipeWire.png diff --git a/buildcraft_resources/gfx/buildcraft/blocks/blocks.png b/buildcraft_resources/gfx/buildcraft/blocks/blocks.png deleted file mode 100644 index 67b17203..00000000 Binary files a/buildcraft_resources/gfx/buildcraft/blocks/blocks.png and /dev/null differ diff --git a/buildcraft_resources/gfx/buildcraft/items/items.png b/buildcraft_resources/gfx/buildcraft/items/items.png deleted file mode 100644 index 085a66ce..00000000 Binary files a/buildcraft_resources/gfx/buildcraft/items/items.png and /dev/null differ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt b/buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt deleted file mode 100644 index 371ff436..00000000 --- a/buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt +++ /dev/null @@ -1,32 +0,0 @@ -0*4 -1*4 -2*4 -3*4 -4*4 -5*4 -6*4 -7*4 -8*4 -9*4 -10*4 -11*4 -12*4 -13*4 -14*4 -15*4 -16*4 -17*4 -18*4 -19*4 -20*4 -21*4 -22*4 -23*4 -24*4 -25*4 -26*4 -27*4 -28*4 -29*4 -30*4 -31*4 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.txt b/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.txt deleted file mode 100644 index d8fe765a..00000000 --- a/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.txt +++ /dev/null @@ -1,32 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -20*2 -21*2 -22*2 -23*2 -24*2 -25*2 -26*2 -27*2 -28*2 -29*2 -30*2 -31*2 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/fuel.txt b/buildcraft_resources/mods/buildcraft/textures/items/fuel.txt deleted file mode 100644 index d8fe765a..00000000 --- a/buildcraft_resources/mods/buildcraft/textures/items/fuel.txt +++ /dev/null @@ -1,32 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 -8*2 -9*2 -10*2 -11*2 -12*2 -13*2 -14*2 -15*2 -16*2 -17*2 -18*2 -19*2 -20*2 -21*2 -22*2 -23*2 -24*2 -25*2 -26*2 -27*2 -28*2 -29*2 -30*2 -31*2 diff --git a/common/buildcraft/core/DefaultProps.java b/common/buildcraft/core/DefaultProps.java index ce3e017f..fc944920 100644 --- a/common/buildcraft/core/DefaultProps.java +++ b/common/buildcraft/core/DefaultProps.java @@ -21,9 +21,9 @@ public class DefaultProps { public static int NETWORK_UPDATE_RANGE = 128; public static int PIPE_CONTENTS_RENDER_DIST = 24; - public static String TEXTURE_PATH_GUI = "/gfx/buildcraft/gui"; - public static String TEXTURE_PATH_BLOCKS = "/gfx/buildcraft/blocks"; - public static String TEXTURE_PATH_ENTITIES = "/gfx/buildcraft/entities"; + public static String TEXTURE_PATH_GUI = "textures/gui"; + public static String TEXTURE_PATH_BLOCKS = "buildcraft:textures/blocks"; + public static String TEXTURE_PATH_ENTITIES = "textures/entities"; public static final String DEFAULT_LANGUAGE = "en_US"; diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index 52909de0..3e3432c4 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -6,6 +6,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import net.minecraftforge.fluids.Fluid; + import org.lwjgl.opengl.GL11; public abstract class GuiAdvancedInterface extends GuiBuildCraft { @@ -162,4 +164,17 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { RenderHelper.enableGUIStandardItemLighting(); } } + + /** + * For the refinery, a king of phantom slot for fluid. + */ + //TODO Get this class working well (Now it's just here to let the refinery compil) + public class FluidSlot extends AdvancedSlot { + + public Fluid stack; + + public FluidSlot(int x, int y) { + super(x, y); + } + } } diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index c6fc7e5a..36eed1c4 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -18,6 +18,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import static net.minecraftforge.common.ForgeDirection.DOWN; import static net.minecraftforge.common.ForgeDirection.EAST; @@ -121,8 +122,8 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor float translatefact = step / 16; - float[] angle = {0, 0, 0}; - float[] translate = {orientation.offsetX, orientation.offsetY, orientation.offsetZ}; + float[] angle = { 0, 0, 0 }; + float[] translate = { orientation.offsetX, orientation.offsetY, orientation.offsetZ }; switch (orientation) { case EAST: @@ -154,7 +155,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor float factor = (float) (1.0 / 16.0); - bindTextureByName(baseTexture); + func_110628_a(new ResourceLocation(baseTexture)); box.render(factor); @@ -162,7 +163,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor movingBox.render(factor); GL11.glTranslatef(-translate[0] * translatefact, -translate[1] * translatefact, -translate[2] * translatefact); - bindTextureByName(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber.png"); + func_110628_a(new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber.png")); float chamberf = 2F / 16F; @@ -192,7 +193,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor break; } - bindTextureByName(texture); + func_110628_a(new ResourceLocation(texture)); trunk.render(factor); diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index 7a8009e7..cebe6326 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -232,8 +232,10 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IPowe data.setFloat("animationSpeed", animationSpeed); powerHandler.writeToNBT(data); - data.setString("filter0", filters[0].getName()); - data.setString("filter1", filters[1].getName()); + if (filters[0] != null) + data.setString("filter0", filters[0].getName()); + if (filters[1] != null) + data.setString("filter1", filters[1].getName()); } public int getAnimationStage() { @@ -376,6 +378,7 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IPowe @Override public PacketPayload getPacketPayload() { PacketPayload payload = new PacketPayloadStream(new PacketPayloadStream.StreamWriter() { + @Override public void writeData(DataOutputStream data) throws IOException { data.writeFloat(animationSpeed); @@ -387,9 +390,11 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IPowe @Override public void handleUpdatePacket(PacketUpdate packet) throws IOException { - DataInputStream stream = ((PacketPayloadStream) packet.payload).stream; - animationSpeed = stream.readFloat(); - tankManager.readData(stream); + if (packet.payload != null) { + DataInputStream stream = ((PacketPayloadStream) packet.payload).stream; + animationSpeed = stream.readFloat(); + tankManager.readData(stream); + } } @Override diff --git a/common/buildcraft/factory/gui/ContainerRefinery.java b/common/buildcraft/factory/gui/ContainerRefinery.java index 8ee1f122..f5fdb467 100644 --- a/common/buildcraft/factory/gui/ContainerRefinery.java +++ b/common/buildcraft/factory/gui/ContainerRefinery.java @@ -65,10 +65,10 @@ public class ContainerRefinery extends BuildCraftContainer { } } - public ItemStack getFilter(int slot) { + public Fluid getFilter(int slot) { Fluid filter = refinery.getFilter(slot); if (filter != null) - return null; // TODO 1.6: er...what to do with this? + return filter; else return null; } diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 3f4c81b5..3bc9f4ef 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -10,6 +10,7 @@ package buildcraft.factory.gui; import buildcraft.api.recipes.RefineryRecipes; +import buildcraft.api.recipes.RefineryRecipes.Recipe; import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtils; @@ -17,6 +18,7 @@ import buildcraft.factory.TileRefinery; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -36,9 +38,9 @@ public class GuiRefinery extends GuiAdvancedInterface { this.slots = new AdvancedSlot[3]; - this.slots[0] = new ItemSlot(38, 54); - this.slots[1] = new ItemSlot(126, 54); - this.slots[2] = new ItemSlot(82, 54); + this.slots[0] = new FluidSlot(38, 54); + this.slots[1] = new FluidSlot(126, 54); + this.slots[2] = new FluidSlot(82, 54); } @Override @@ -54,7 +56,7 @@ public class GuiRefinery extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.renderEngine.func_110577_a(TEXTURE); int j = (width - xSize) / 2; int k = (height - ySize) / 2; @@ -85,35 +87,34 @@ public class GuiRefinery extends GuiAdvancedInterface { if (liquid == null) return; - container.setFilter(position, liquid.itemID, liquid.itemMeta); + container.setFilter(position, liquid.getFluid()); } } private void updateSlots() { - ItemStack filter0 = container.getFilter(0); - ItemStack filter1 = container.getFilter(1); + Fluid filter0 = container.getFilter(0); + Fluid filter1 = container.getFilter(1); - ((ItemSlot) slots[0]).stack = filter0; - ((ItemSlot) slots[1]).stack = filter1; + ((FluidSlot) slots[0]).stack = filter0; + ((FluidSlot) slots[1]).stack = filter1; FluidStack liquid0 = null; FluidStack liquid1 = null; - // TODO 1.6: Replace these with Phantom slots? -CovertJaguar if (filter0 != null) { - liquid0 = new FluidStack(filter0.itemID, FluidContainerRegistry.BUCKET_VOLUME, filter0.getItemDamage()); + liquid0 = new FluidStack(filter0, FluidContainerRegistry.BUCKET_VOLUME); } if (filter1 != null) { - liquid1 = new FluidStack(filter1.itemID, FluidContainerRegistry.BUCKET_VOLUME, filter1.getItemDamage()); + liquid1 = new FluidStack(filter1, FluidContainerRegistry.BUCKET_VOLUME); } - RefineryRecipes recipe = RefineryRecipes.findRefineryRecipe(liquid0, liquid1); + Recipe recipe = RefineryRecipes.findRefineryRecipe(liquid0, liquid1); if (recipe != null) { - ((ItemSlot) slots[2]).stack = recipe.result.asItemStack(); + ((FluidSlot) slots[2]).stack = recipe.result.getFluid(); } else { - ((ItemSlot) slots[2]).stack = null; + ((FluidSlot) slots[2]).stack = null; } } diff --git a/common/buildcraft/factory/network/PacketHandlerFactory.java b/common/buildcraft/factory/network/PacketHandlerFactory.java index fbe2dd51..bf9d7dd0 100644 --- a/common/buildcraft/factory/network/PacketHandlerFactory.java +++ b/common/buildcraft/factory/network/PacketHandlerFactory.java @@ -56,9 +56,9 @@ public class PacketHandlerFactory implements IPacketHandler { private void onRefinerySelect(EntityPlayer playerEntity, PacketUpdate packet) throws IOException { TileRefinery tile = getRefinery(playerEntity.worldObj, packet.posX, packet.posY, packet.posZ); - if (tile == null) + if (tile == null || packet.payload == null) return; - + DataInputStream stream = ((PacketPayloadStream)packet.payload).stream; tile.setFilter(stream.readByte(), FluidRegistry.getFluid(stream.readShort())); diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index 9f600b76..46e519fd 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -15,8 +15,8 @@ import org.lwjgl.opengl.GL11; public class RenderHopper extends TileEntitySpecialRenderer implements IInventoryRenderer { - private static final ResourceLocation HOPPER_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper.png"); - private static final ResourceLocation HOPPER_MIDDLE_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper_middle.png"); + private static final ResourceLocation HOPPER_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper.png"); + private static final ResourceLocation HOPPER_MIDDLE_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper_middle.png"); private ModelBase model = new ModelBase() { }; private final ModelRenderer top; diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index 9851a104..a2d0fe25 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -22,7 +22,7 @@ import org.lwjgl.opengl.GL11; public class RenderRefinery extends TileEntitySpecialRenderer implements IInventoryRenderer { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_BLOCKS + "/refinery.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft:textures/blocks/refinery.png"); private static final float pixel = (float) (1.0 / 16.0); private final ModelRenderer tank; private final ModelRenderer magnet[] = new ModelRenderer[4]; diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index e9486e04..b4123ba3 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection;