From 9e6e198794e4359ea34f2364dab48eca616dfed0 Mon Sep 17 00:00:00 2001 From: samoht-2401 Date: Wed, 17 Jul 2013 18:54:04 +0200 Subject: [PATCH] Get things running / New 1.6 ressource directory Modified some little things in order to be able to compile. The new ressource organization is added too. --- .../{gfx => assets}/buildcraft/logo.png | Bin .../blocks/advworkbenchtable_bottom.png | Bin .../blocks/advworkbenchtable_side.png | Bin .../textures/blocks/advworkbenchtable_top.png | Bin .../textures/blocks/architect_front.png | Bin .../textures/blocks/architect_sides.png | Bin .../textures/blocks/architect_top.png | Bin .../textures/blocks/architect_top_neg.png | Bin .../textures/blocks/architect_top_pos.png | Bin .../textures/blocks/assemblytable_bottom.png | Bin .../textures/blocks/assemblytable_side.png | Bin .../textures/blocks/assemblytable_top.png | Bin .../textures/blocks/autoWorkbench_side.png | Bin .../textures/blocks/autoWorkbench_top.png | Bin .../buildcraft/textures}/blocks/base_iron.png | Bin .../textures}/blocks/base_stone.png | Bin .../buildcraft/textures}/blocks/base_wood.png | Bin .../textures/blocks/blockBlueLaser.png | Bin .../textures/blocks/blockDrillHeadTexture.png | Bin .../textures/blocks/blockDrillTexture.png | Bin .../textures/blocks/blockFillerSides.png | Bin .../textures/blocks/blockFillerTopOff.png | Bin .../textures/blocks/blockFillerTopOn.png | Bin .../buildcraft/textures/blocks/blockFrame.png | Bin .../textures/blocks/blockMarker.png | Bin .../textures/blocks/blockPathMarker.png | Bin .../textures/blocks/blockPathMarkerActive.png | Bin .../textures/blocks/blockPlainPipe.png | Bin .../textures/blocks/blockRedLaser.png | Bin .../textures/blocks/blockStripesLaser.png | Bin .../textures/blocks/blockTransparentLaser.png | Bin .../textures/blocks/block_12_13.png | Bin .../textures/blocks/block_12_14.png | Bin .../textures/blocks/block_12_15.png | Bin .../textures/blocks/block_13_14.png | Bin .../textures/blocks/block_13_15.png | Bin .../buildcraft/textures/blocks/block_15_0.png | Bin .../buildcraft/textures/blocks/block_15_1.png | Bin .../buildcraft/textures/blocks/block_15_2.png | Bin .../buildcraft/textures/blocks/block_15_3.png | Bin .../buildcraft/textures/blocks/block_15_4.png | Bin .../buildcraft/textures/blocks/block_15_5.png | Bin .../buildcraft/textures/blocks/block_15_6.png | Bin .../buildcraft/textures/blocks/block_15_7.png | Bin .../buildcraft/textures/blocks/block_15_8.png | Bin .../buildcraft/textures/blocks/block_15_9.png | Bin .../buildcraft/textures/blocks/block_1_4.png | Bin .../buildcraft/textures/blocks/block_5_0.png | Bin .../buildcraft/textures/blocks/block_5_1.png | Bin .../buildcraft/textures/blocks/block_5_10.png | Bin .../buildcraft/textures/blocks/block_5_11.png | Bin .../buildcraft/textures/blocks/block_5_12.png | Bin .../buildcraft/textures/blocks/block_5_13.png | Bin .../buildcraft/textures/blocks/block_5_14.png | Bin .../buildcraft/textures/blocks/block_5_15.png | Bin .../buildcraft/textures/blocks/block_5_2.png | Bin .../buildcraft/textures/blocks/block_5_3.png | Bin .../buildcraft/textures/blocks/block_5_4.png | Bin .../buildcraft/textures/blocks/block_5_5.png | Bin .../buildcraft/textures/blocks/block_5_6.png | Bin .../buildcraft/textures/blocks/block_5_7.png | Bin .../buildcraft/textures/blocks/block_5_8.png | Bin .../buildcraft/textures/blocks/block_5_9.png | Bin .../buildcraft/textures/blocks/block_7_11.png | Bin .../buildcraft/textures/blocks/block_7_12.png | Bin .../buildcraft/textures/blocks/block_7_15.png | Bin .../buildcraft/textures/blocks/block_7_5.png | Bin .../buildcraft/textures/blocks/block_7_7.png | Bin .../buildcraft/textures/blocks/block_7_9.png | Bin .../buildcraft/textures/blocks/block_8_0.png | Bin .../buildcraft/textures/blocks/block_8_1.png | Bin .../buildcraft/textures/blocks/block_8_2.png | Bin .../buildcraft/textures/blocks/block_8_3.png | Bin .../textures/blocks/builder_front.png | Bin .../textures/blocks/builder_side.png | Bin .../textures/blocks/builder_top.png | Bin .../buildcraft/textures}/blocks/chamber.png | Bin .../textures/blocks/engineIronBottom.png | Bin .../textures/blocks/engineIronSide.png | Bin .../textures/blocks/engineIronTop.png | Bin .../textures/blocks/engineStoneBottom.png | Bin .../textures/blocks/engineStoneSide.png | Bin .../textures/blocks/engineStoneTop.png | Bin .../textures/blocks/engineWoodBottom.png | Bin .../textures/blocks/engineWoodSide.png | Bin .../textures/blocks/engineWoodTop.png | Bin .../textures/blocks/fillerPatterns/clear.png | Bin .../blocks/fillerPatterns/fillAll.png | Bin .../blocks/fillerPatterns/flatten.png | Bin .../blocks/fillerPatterns/horizon.png | Bin .../blocks/fillerPatterns/pyramid.png | Bin .../textures/blocks/fillerPatterns/stairs.png | Bin .../textures/blocks/fillerPatterns/walls.png | Bin .../textures/blocks/filteredBuffer_all.png | Bin .../buildcraft/textures/blocks}/fuel.png | Bin .../textures/blocks/fuel.png.mcmeta | 45 ++++++++++++++++++ .../textures/blocks/gate_autarchic_dark.png | Bin .../gate_autarchic_diamond_and_dark.png | Bin .../blocks/gate_autarchic_diamond_and_lit.png | Bin .../blocks/gate_autarchic_diamond_or_dark.png | Bin .../blocks/gate_autarchic_diamond_or_lit.png | Bin .../blocks/gate_autarchic_gold_and_dark.png | Bin .../blocks/gate_autarchic_gold_and_lit.png | Bin .../blocks/gate_autarchic_gold_or_dark.png | Bin .../blocks/gate_autarchic_gold_or_lit.png | Bin .../blocks/gate_autarchic_iron_and_dark.png | Bin .../blocks/gate_autarchic_iron_and_lit.png | Bin .../blocks/gate_autarchic_iron_or_dark.png | Bin .../blocks/gate_autarchic_iron_or_lit.png | Bin .../textures/blocks/gate_autarchic_lit.png | Bin .../buildcraft/textures/blocks/gate_dark.png | Bin .../textures/blocks/gate_diamond_and_dark.png | Bin .../textures/blocks/gate_diamond_and_lit.png | Bin .../textures/blocks/gate_diamond_or_dark.png | Bin .../textures/blocks/gate_diamond_or_lit.png | Bin .../textures/blocks/gate_gold_and_dark.png | Bin .../textures/blocks/gate_gold_and_lit.png | Bin .../textures/blocks/gate_gold_or_dark.png | Bin .../textures/blocks/gate_gold_or_lit.png | Bin .../textures/blocks/gate_iron_and_dark.png | Bin .../textures/blocks/gate_iron_and_lit.png | Bin .../textures/blocks/gate_iron_or_dark.png | Bin .../textures/blocks/gate_iron_or_lit.png | Bin .../buildcraft/textures/blocks/gate_lit.png | Bin .../buildcraft/textures}/blocks/hopper.png | Bin .../textures/blocks/hopperBottom.png | Bin .../buildcraft/textures/blocks/hopperSide.png | Bin .../buildcraft/textures/blocks/hopperTop.png | Bin .../textures}/blocks/hopper_middle.png | Bin .../textures/blocks/laser_bottom.png | Bin .../buildcraft/textures/blocks/laser_side.png | Bin .../buildcraft/textures/blocks/laser_top.png | Bin .../textures/blocks/library_side.png | Bin .../textures/blocks/library_topbottom.png | Bin .../textures/blocks/miningwell_back.png | Bin .../textures/blocks/miningwell_front.png | Bin .../textures/blocks/miningwell_side.png | Bin .../textures/blocks/miningwell_top.png | Bin .../buildcraft/textures/blocks/oil.png | Bin .../buildcraft/textures/blocks/oil.png.mcmeta | 45 ++++++++++++++++++ .../buildcraft/textures/blocks/oil_flow.png | Bin .../textures/blocks/oil_flow.png.mcmeta | 45 ++++++++++++++++++ .../textures/blocks/pipeAllEmerald_solid.png | Bin .../textures/blocks/pipeAllIron_solid.png | Bin .../textures/blocks/pipeAllWood_solid.png | Bin .../blocks/pipeFluidsCobblestone.png} | Bin .../blocks/pipeFluidsEmerald_standard.png} | Bin .../textures/blocks/pipeFluidsGold.png} | Bin .../blocks/pipeFluidsIron_standard.png} | Bin .../textures/blocks/pipeFluidsSandstone.png} | Bin .../textures/blocks/pipeFluidsStone.png} | Bin .../textures/blocks/pipeFluidsVoid.png} | Bin .../blocks/pipeFluidsWood_standard.png} | Bin .../textures/blocks/pipeItemsCobblestone.png | Bin .../blocks/pipeItemsDiamond_center.png | Bin .../textures/blocks/pipeItemsDiamond_down.png | Bin .../textures/blocks/pipeItemsDiamond_east.png | Bin .../blocks/pipeItemsDiamond_north.png | Bin .../blocks/pipeItemsDiamond_south.png | Bin .../textures/blocks/pipeItemsDiamond_up.png | Bin .../textures/blocks/pipeItemsDiamond_west.png | Bin .../blocks/pipeItemsEmerald_standard.png | Bin .../textures/blocks/pipeItemsGold.png | Bin .../blocks/pipeItemsIron_standard.png | Bin .../textures/blocks/pipeItemsObsidian.png | Bin .../textures/blocks/pipeItemsQuartz.png | Bin .../textures/blocks/pipeItemsSandstone.png | Bin .../textures/blocks/pipeItemsStone.png | Bin .../textures/blocks/pipeItemsVoid.png | Bin .../blocks/pipeItemsWood_standard.png | Bin .../textures/blocks/pipePowerCobblestone.png | Bin .../textures/blocks/pipePowerDiamond.png | Bin .../textures/blocks/pipePowerGold.png | Bin .../textures/blocks/pipePowerQuartz.png | Bin .../textures/blocks/pipePowerStone.png | Bin .../blocks/pipePowerWood_standard.png | Bin .../textures/blocks/pipeStripes.png | Bin .../blocks/pipeStructureCobblestone.png | Bin .../textures/blocks/pump_bottom.png | Bin .../buildcraft/textures/blocks/pump_side.png | Bin .../buildcraft/textures/blocks/pump_top.png | Bin .../buildcraft/textures/blocks/pump_tube.png | Bin .../textures/blocks/quarry_front.png | Bin .../textures/blocks/quarry_side.png | Bin .../buildcraft/textures/blocks/quarry_top.png | Bin .../buildcraft/textures}/blocks/refinery.png | Bin .../textures/blocks/refineryBack.png | Bin .../textures/blocks/refineryBottom.png | Bin .../textures/blocks/refineryEast.png | Bin .../textures/blocks/refineryFront.png | Bin .../textures/blocks/refineryTop.png | Bin .../textures/blocks/refineryWest.png | Bin .../textures/blocks/tank_bottom_side.png | Bin .../textures/blocks/tank_stacked_side.png | Bin .../buildcraft/textures/blocks/tank_top.png | Bin .../textures/blocks/texture_blue_dark.png | Bin .../textures/blocks/texture_blue_lit.png | Bin .../textures/blocks/texture_cyan.png | Bin .../textures/blocks/texture_green_dark.png | Bin .../textures/blocks/texture_green_lit.png | Bin .../textures/blocks/texture_red_dark.png | Bin .../textures/blocks/texture_red_lit.png | Bin .../textures/blocks/texture_yellow_dark.png | Bin .../textures/blocks/texture_yellow_lit.png | Bin .../textures}/blocks/trunk_blue.png | Bin .../textures}/blocks/trunk_green.png | Bin .../buildcraft/textures}/blocks/trunk_red.png | Bin .../textures}/blocks/trunk_yellow.png | Bin .../buildcraft/textures}/entities/laser_1.png | Bin .../buildcraft/textures}/entities/laser_2.png | Bin .../buildcraft/textures}/entities/laser_3.png | Bin .../buildcraft/textures}/entities/laser_4.png | Bin .../buildcraft/textures}/entities/robot.png | Bin .../buildcraft/textures}/entities/stripes.png | Bin .../gui/assembly_advancedworkbench.png | Bin .../textures}/gui/assembly_table.png | Bin .../buildcraft/textures}/gui/autobench.png | Bin .../buildcraft/textures}/gui/builder.png | Bin .../textures}/gui/builder_blueprint.png | Bin .../buildcraft/textures}/gui/buttons.png | Bin .../textures}/gui/combustion_engine_gui.png | Bin .../buildcraft/textures}/gui/filler.png | Bin .../buildcraft/textures}/gui/filter.png | Bin .../buildcraft/textures}/gui/filter_2.png | Bin .../textures}/gui/filteredBuffer_gui.png | Bin .../textures}/gui/gate_interface_1.png | Bin .../textures}/gui/gate_interface_2.png | Bin .../textures}/gui/gate_interface_3.png | Bin .../textures}/gui/gate_interface_4.png | Bin .../buildcraft/textures}/gui/hopper_gui.png | Bin .../buildcraft/textures}/gui/icons.png | Bin .../buildcraft/textures}/gui/ledger.png | Bin .../buildcraft/textures}/gui/library_r.png | Bin .../buildcraft/textures}/gui/library_rw.png | Bin .../textures}/gui/refinery_filter.png | Bin .../textures}/gui/steam_engine_gui.png | Bin .../buildcraft/textures}/gui/template_gui.png | Bin .../buildcraft/textures}/gui/triggers.png | Bin .../textures/items/autarchic_gate.png | Bin .../items/autarchic_gate_diamond_and.png | Bin .../items/autarchic_gate_diamond_or.png | Bin .../items/autarchic_gate_gold_and.png | Bin .../textures/items/autarchic_gate_gold_or.png | Bin .../items/autarchic_gate_iron_and.png | Bin .../textures/items/autarchic_gate_iron_or.png | Bin .../buildcraft/textures/items/block_0_0.png | Bin .../textures/items/bluePipeWire.png | Bin .../textures/items/blueprint_clean.png | Bin .../textures/items/blueprint_used.png | Bin .../buildcraft/textures/items/bucketFuel.png | Bin .../buildcraft/textures/items/bucketOil.png} | Bin .../textures/items/diamondGearItem.png | Bin .../buildcraft/textures/items/gate.png | Bin .../textures/items/gate_diamond_and.png | Bin .../textures/items/gate_diamond_or.png | Bin .../textures/items/gate_gold_and.png | Bin .../textures/items/gate_gold_or.png | Bin .../textures/items/gate_iron_and.png | Bin .../textures/items/gate_iron_or.png | Bin .../textures/items/goldGearItem.png | Bin .../textures/items/greenPipeWire.png | Bin .../textures/items/icons/energy.png | Bin .../textures/items/icons/guiicons_0_1.png | Bin .../textures/items/icons/guiicons_0_2.png | Bin .../textures/items/icons/guiicons_0_3.png | Bin .../textures/items/icons/guiicons_0_4.png | Bin .../textures/items/ironGearItem.png | Bin .../textures/items/pipeWaterproof.png | Bin .../buildcraft/textures/items/redPipeWire.png | Bin .../items/redstone_diamond_chipset.png | Bin .../textures/items/redstone_gold_chipset.png | Bin .../textures/items/redstone_iron_chipset.png | Bin .../items/redstone_pulsating_chipset.png | Bin .../textures/items/redstone_red_chipset.png | Bin .../textures/items/stoneGearItem.png | Bin .../textures/items/template_clean.png | Bin .../textures/items/template_used.png | Bin .../triggers/action_machinecontrol_loop.png | Bin .../triggers/action_machinecontrol_off.png | Bin .../triggers/action_machinecontrol_on.png | Bin .../items/triggers/guitriggers_3_4.png | Bin .../items/triggers/guitriggers_5_0.png | Bin .../items/triggers/guitriggers_5_1.png | Bin .../items/triggers/guitriggers_5_2.png | Bin .../items/triggers/guitriggers_5_3.png | Bin .../items/triggers/guitriggers_5_4.png | Bin .../items/triggers/guitriggers_5_5.png | Bin .../triggers/trigger_engineheat_blue.png | Bin .../triggers/trigger_engineheat_green.png | Bin .../items/triggers/trigger_engineheat_red.png | Bin .../triggers/trigger_engineheat_yellow.png | Bin .../triggers/trigger_inventory_below25.png | Bin .../triggers/trigger_inventory_below50.png | Bin .../triggers/trigger_inventory_below75.png | Bin .../triggers/trigger_inventory_contains.png | Bin .../triggers/trigger_inventory_empty.png | Bin .../items/triggers/trigger_inventory_full.png | Bin .../triggers/trigger_inventory_space.png | Bin .../trigger_liquidcontainer_contains.png | Bin .../trigger_liquidcontainer_empty.png | Bin .../triggers/trigger_liquidcontainer_full.png | Bin .../trigger_liquidcontainer_space.png | Bin .../items/triggers/trigger_machine_active.png | Bin .../triggers/trigger_machine_inactive.png | Bin .../trigger_pipecontents_containsenergy.png | Bin .../trigger_pipecontents_containsitems.png | Bin .../trigger_pipecontents_containsliquid.png | Bin .../triggers/trigger_pipecontents_empty.png | Bin .../trigger_pipecontents_requestsenergy.png | Bin .../trigger_pipecontents_toomuchenergy.png | Bin .../trigger_pipesignal_blue_active.png | Bin .../trigger_pipesignal_blue_inactive.png | Bin .../trigger_pipesignal_green_active.png | Bin .../trigger_pipesignal_green_inactive.png | Bin .../trigger_pipesignal_red_active.png | Bin .../trigger_pipesignal_red_inactive.png | Bin .../trigger_pipesignal_yellow_active.png | Bin .../trigger_pipesignal_yellow_inactive.png | Bin .../triggers/trigger_redstoneinput_active.png | Bin .../trigger_redstoneinput_inactive.png | Bin .../textures/items/woodenGearItem.png | Bin .../buildcraft/textures/items/wrenchItem.png | Bin .../textures/items/yellowPipeWire.png | Bin .../gfx/buildcraft/blocks/blocks.png | Bin 24633 -> 0 bytes .../gfx/buildcraft/items/items.png | Bin 8197 -> 0 bytes .../mods/buildcraft/textures/blocks/oil.txt | 32 ------------- .../buildcraft/textures/blocks/oil_flow.txt | 32 ------------- .../mods/buildcraft/textures/items/fuel.txt | 32 ------------- common/buildcraft/core/DefaultProps.java | 6 +-- .../core/gui/GuiAdvancedInterface.java | 15 ++++++ .../energy/render/RenderEngine.java | 11 +++-- common/buildcraft/factory/TileRefinery.java | 15 ++++-- .../factory/gui/ContainerRefinery.java | 4 +- .../buildcraft/factory/gui/GuiRefinery.java | 31 ++++++------ .../factory/network/PacketHandlerFactory.java | 4 +- .../factory/render/RenderHopper.java | 4 +- .../factory/render/RenderRefinery.java | 2 +- .../transport/render/PipeWorldRenderer.java | 1 + 338 files changed, 193 insertions(+), 131 deletions(-) rename buildcraft_resources/{gfx => assets}/buildcraft/logo.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/advworkbenchtable_bottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/advworkbenchtable_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/advworkbenchtable_top.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/architect_front.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/architect_sides.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/architect_top.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/architect_top_neg.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/architect_top_pos.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/assemblytable_bottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/assemblytable_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/assemblytable_top.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/autoWorkbench_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/autoWorkbench_top.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/base_iron.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/base_stone.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/base_wood.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockBlueLaser.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockDrillHeadTexture.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockDrillTexture.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockFillerSides.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockFillerTopOff.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockFillerTopOn.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockFrame.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockMarker.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockPathMarker.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockPathMarkerActive.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockPlainPipe.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockRedLaser.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockStripesLaser.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/blockTransparentLaser.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_12_13.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_12_14.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_12_15.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_13_14.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_13_15.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_0.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_1.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_2.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_3.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_4.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_5.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_6.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_7.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_8.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_15_9.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_1_4.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_0.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_1.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_10.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_11.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_12.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_13.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_14.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_15.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_2.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_3.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_4.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_5.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_6.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_7.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_8.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_5_9.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_7_11.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_7_12.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_7_15.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_7_5.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_7_7.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_7_9.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_8_0.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_8_1.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_8_2.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/block_8_3.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/builder_front.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/builder_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/builder_top.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/chamber.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineIronBottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineIronSide.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineIronTop.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineStoneBottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineStoneSide.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineStoneTop.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineWoodBottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineWoodSide.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/engineWoodTop.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/fillerPatterns/clear.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/fillerPatterns/fillAll.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/fillerPatterns/flatten.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/fillerPatterns/horizon.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/fillerPatterns/pyramid.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/fillerPatterns/stairs.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/fillerPatterns/walls.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/filteredBuffer_all.png (100%) rename buildcraft_resources/{mods/buildcraft/textures/items => assets/buildcraft/textures/blocks}/fuel.png (100%) create mode 100644 buildcraft_resources/assets/buildcraft/textures/blocks/fuel.png.mcmeta rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_diamond_and_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_diamond_and_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_diamond_or_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_diamond_or_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_gold_and_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_gold_and_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_gold_or_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_gold_or_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_iron_and_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_iron_and_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_iron_or_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_iron_or_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_autarchic_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_diamond_and_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_diamond_and_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_diamond_or_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_diamond_or_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_gold_and_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_gold_and_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_gold_or_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_gold_or_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_iron_and_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_iron_and_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_iron_or_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_iron_or_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/gate_lit.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/hopper.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/hopperBottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/hopperSide.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/hopperTop.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/hopper_middle.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/laser_bottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/laser_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/laser_top.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/library_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/library_topbottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/miningwell_back.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/miningwell_front.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/miningwell_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/miningwell_top.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/oil.png (100%) create mode 100644 buildcraft_resources/assets/buildcraft/textures/blocks/oil.png.mcmeta rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/oil_flow.png (100%) create mode 100644 buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png.mcmeta rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeAllEmerald_solid.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeAllIron_solid.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeAllWood_solid.png (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsCobblestone.png => assets/buildcraft/textures/blocks/pipeFluidsCobblestone.png} (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsEmerald_standard.png => assets/buildcraft/textures/blocks/pipeFluidsEmerald_standard.png} (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsGold.png => assets/buildcraft/textures/blocks/pipeFluidsGold.png} (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsIron_standard.png => assets/buildcraft/textures/blocks/pipeFluidsIron_standard.png} (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsSandstone.png => assets/buildcraft/textures/blocks/pipeFluidsSandstone.png} (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsStone.png => assets/buildcraft/textures/blocks/pipeFluidsStone.png} (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsVoid.png => assets/buildcraft/textures/blocks/pipeFluidsVoid.png} (100%) rename buildcraft_resources/{mods/buildcraft/textures/blocks/pipeLiquidsWood_standard.png => assets/buildcraft/textures/blocks/pipeFluidsWood_standard.png} (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsCobblestone.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsDiamond_center.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsDiamond_down.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsDiamond_east.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsDiamond_north.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsDiamond_south.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsDiamond_up.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsDiamond_west.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsEmerald_standard.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsGold.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsIron_standard.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsObsidian.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsQuartz.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsSandstone.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsStone.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsVoid.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeItemsWood_standard.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipePowerCobblestone.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipePowerDiamond.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipePowerGold.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipePowerQuartz.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipePowerStone.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipePowerWood_standard.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeStripes.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pipeStructureCobblestone.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pump_bottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pump_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pump_top.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/pump_tube.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/quarry_front.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/quarry_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/quarry_top.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/refinery.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/refineryBack.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/refineryBottom.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/refineryEast.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/refineryFront.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/refineryTop.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/refineryWest.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/tank_bottom_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/tank_stacked_side.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/tank_top.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_blue_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_blue_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_cyan.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_green_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_green_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_red_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_red_lit.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_yellow_dark.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/blocks/texture_yellow_lit.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/trunk_blue.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/trunk_green.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/trunk_red.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/blocks/trunk_yellow.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/entities/laser_1.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/entities/laser_2.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/entities/laser_3.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/entities/laser_4.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/entities/robot.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/entities/stripes.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/assembly_advancedworkbench.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/assembly_table.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/autobench.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/builder.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/builder_blueprint.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/buttons.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/combustion_engine_gui.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/filler.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/filter.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/filter_2.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/filteredBuffer_gui.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/gate_interface_1.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/gate_interface_2.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/gate_interface_3.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/gate_interface_4.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/hopper_gui.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/icons.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/ledger.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/library_r.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/library_rw.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/refinery_filter.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/steam_engine_gui.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/template_gui.png (100%) rename buildcraft_resources/{gfx/buildcraft => assets/buildcraft/textures}/gui/triggers.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/autarchic_gate.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/autarchic_gate_diamond_and.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/autarchic_gate_diamond_or.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/autarchic_gate_gold_and.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/autarchic_gate_gold_or.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/autarchic_gate_iron_and.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/autarchic_gate_iron_or.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/block_0_0.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/bluePipeWire.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/blueprint_clean.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/blueprint_used.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/bucketFuel.png (100%) rename buildcraft_resources/{mods/buildcraft/textures/items/oil_bucket.png => assets/buildcraft/textures/items/bucketOil.png} (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/diamondGearItem.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/gate.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/gate_diamond_and.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/gate_diamond_or.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/gate_gold_and.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/gate_gold_or.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/gate_iron_and.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/gate_iron_or.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/goldGearItem.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/greenPipeWire.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/icons/energy.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/icons/guiicons_0_1.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/icons/guiicons_0_2.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/icons/guiicons_0_3.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/icons/guiicons_0_4.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/ironGearItem.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/pipeWaterproof.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/redPipeWire.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/redstone_diamond_chipset.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/redstone_gold_chipset.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/redstone_iron_chipset.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/redstone_pulsating_chipset.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/redstone_red_chipset.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/stoneGearItem.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/template_clean.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/template_used.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/action_machinecontrol_loop.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/action_machinecontrol_off.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/action_machinecontrol_on.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/guitriggers_3_4.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/guitriggers_5_0.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/guitriggers_5_1.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/guitriggers_5_2.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/guitriggers_5_3.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/guitriggers_5_4.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/guitriggers_5_5.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_engineheat_blue.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_engineheat_green.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_engineheat_red.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_inventory_below25.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_inventory_below50.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_inventory_below75.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_inventory_contains.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_inventory_empty.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_inventory_full.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_inventory_space.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_machine_active.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_machine_inactive.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipecontents_containsliquid.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipecontents_requestsenergy.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipecontents_toomuchenergy.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/woodenGearItem.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/wrenchItem.png (100%) rename buildcraft_resources/{mods => assets}/buildcraft/textures/items/yellowPipeWire.png (100%) delete mode 100644 buildcraft_resources/gfx/buildcraft/blocks/blocks.png delete mode 100644 buildcraft_resources/gfx/buildcraft/items/items.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.txt delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/fuel.txt 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 67b17203a32c0bb63a319f8fe54cbd10dd607553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24633 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 YScx>d%gAHg89kt`tgTf3#3Jnf0E~ONmH+?% 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;