diff --git a/api/buildcraft/api/core/EnumColor.java b/api/buildcraft/api/core/EnumColor.java index c5ea8899..1ba7e37b 100644 --- a/api/buildcraft/api/core/EnumColor.java +++ b/api/buildcraft/api/core/EnumColor.java @@ -196,7 +196,7 @@ public enum EnumColor { public static void registerIcons(IIconRegister iconRegister) { brushIcons = new IIcon[16]; for (EnumColor c : values()) { - brushIcons[c.ordinal()] = iconRegister.registerIcon("buildcraft:triggers/color_" + brushIcons[c.ordinal()] = iconRegister.registerIcon("buildcraftcore:triggers/color_" + c.name().toLowerCase(Locale.ENGLISH)); } } diff --git a/api/buildcraft/api/core/package-info.java b/api/buildcraft/api/core/package-info.java index 60436f3d..0fc4db4c 100644 --- a/api/buildcraft/api/core/package-info.java +++ b/api/buildcraft/api/core/package-info.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "1.4", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") +@API(apiVersion = "1.5", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") package buildcraft.api.core; import cpw.mods.fml.common.API; diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockEnergyConverter.png b/buildcraft_resources/assets/buildcraft/textures/blocks/blockEnergyConverter.png deleted file mode 100644 index 6ae08451..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/blockEnergyConverter.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chamber_wood.png b/buildcraft_resources/assets/buildcraft/textures/blocks/chamber_wood.png deleted file mode 100644 index 616afbaf..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/chamber_wood.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronSide.png deleted file mode 100644 index 383e4bc5..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronSide.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronTop.png deleted file mode 100644 index d2d6ecdf..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronTop.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneSide.png deleted file mode 100644 index aada8608..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneSide.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneTop.png deleted file mode 100644 index 5ebeb554..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneTop.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodSide.png deleted file mode 100644 index 6ffb150f..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodSide.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodTop.png deleted file mode 100644 index 5c2fcc89..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodTop.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/hopperSide.png b/buildcraft_resources/assets/buildcraft/textures/blocks/hopperSide.png deleted file mode 100644 index 6d41fe08..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/hopperSide.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/hopperTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/hopperTop.png deleted file mode 100644 index 1699eaad..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/hopperTop.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryBottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryBottom.png deleted file mode 100644 index b69d62f0..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryBottom.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryEast.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryEast.png deleted file mode 100644 index e46fb119..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryEast.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryFront.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryFront.png deleted file mode 100644 index 988761ab..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryFront.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryTop.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryTop.png deleted file mode 100644 index 0b086233..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryTop.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryWest.png b/buildcraft_resources/assets/buildcraft/textures/blocks/refineryWest.png deleted file mode 100644 index a852b90b..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryWest.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/requester_front.png b/buildcraft_resources/assets/buildcraft/textures/blocks/requester_front.png deleted file mode 100755 index ab5ee522..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/requester_front.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/testcase.png b/buildcraft_resources/assets/buildcraft/textures/blocks/testcase.png deleted file mode 100644 index d4dd844d..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/blocks/testcase.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/tester.png b/buildcraft_resources/assets/buildcraft/textures/gui/tester.png deleted file mode 100644 index 0e6bb74c..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/gui/tester.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/items/letter.png b/buildcraft_resources/assets/buildcraft/textures/items/letter.png deleted file mode 100644 index 1b26135a..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/items/letter.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/items/pipePowerAdapter.png b/buildcraft_resources/assets/buildcraft/textures/items/pipePowerAdapter.png deleted file mode 100644 index aba91d93..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/items/pipePowerAdapter.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/items/test.png b/buildcraft_resources/assets/buildcraft/textures/items/test.png deleted file mode 100644 index d0cb44ee..00000000 Binary files a/buildcraft_resources/assets/buildcraft/textures/items/test.png and /dev/null differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/architect_side.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/architect_side.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/architect_front.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/front.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/architect_front.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/front.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/architect_top.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/architect_top.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/builder_side.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/builder_side.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/builder_front.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/front.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/builder_front.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/front.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/builder_top.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/builder_top.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/constructMarker.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/constructMarker.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/constructMarkerRec.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/recording.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/constructMarkerRec.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/recording.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerSides.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerSides.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOn.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOn.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOff.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/top_off.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockFillerTopOff.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/top_off.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/library_side.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/libraryBlock/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/library_side.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/libraryBlock/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/library_topbottom.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/libraryBlock/topbottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/library_topbottom.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/libraryBlock/topbottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockMarker.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/markerBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockMarker.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/markerBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarkerActive.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/active.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarkerActive.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/active.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarker.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockPathMarker.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/blocks/pathMarkerBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/architect_gui.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/architect_gui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/architect_gui.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/architect_gui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/builder.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/builder.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/builder_blueprint.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_blueprint.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/builder_blueprint.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_blueprint.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/builder_foreground.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_foreground.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/builder_foreground.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/builder_foreground.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/filler.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/filler.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/filler.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/filler.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/library_rw.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/library_rw.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/library_rw.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/library_rw.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/urbanist_tool_filler.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_filler.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/urbanist_tool_filler.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_filler.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/urbanist_tool_place_block.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_place_block.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/urbanist_tool_place_block.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tool_place_block.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/urbanist_tools.png b/buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tools.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/urbanist_tools.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/gui/urbanist_tools.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/blueprint_clean.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/clean.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/blueprint_clean.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/clean.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/blueprint_used.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/used.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/blueprint_used.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/blueprint/used.png diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/default.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/default.png new file mode 100644 index 00000000..6590c46d Binary files /dev/null and b/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/default.png differ diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/recording.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/recording.png new file mode 100644 index 00000000..1dfb2a35 Binary files /dev/null and b/buildcraft_resources/assets/buildcraftbuilders/textures/items/constructionMarkerBlock/recording.png differ diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_area.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_area.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_area.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_area.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_block.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_block.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_block.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_block.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_blueprint.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_blueprint.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_blueprint.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_blueprint.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_erase.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_erase.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_erase.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_erase.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_filler.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_filler.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_filler.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_filler.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_path.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_path.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/urbanist_path.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/icons/urbanist_path.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/template_clean.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/template/clean.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/template_clean.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/template/clean.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/template_used.png b/buildcraft_resources/assets/buildcraftbuilders/textures/items/template/used.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/template_used.png rename to buildcraft_resources/assets/buildcraftbuilders/textures/items/template/used.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_blue.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/trunk_blue.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_green.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/trunk_green.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_overheat.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_overheat.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/trunk_overheat.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_overheat.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_red.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/trunk_red.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_yellow.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/trunk_yellow.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/base_wood.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/base.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/base_wood.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/base.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chamber2.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/chamber.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/chamber2.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/chamber.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodBottom.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/icon.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/engineWoodBottom.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/icon.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/box.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/box.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/box.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/box.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/clear.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/clear.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/clear.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/clear.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/cylinder.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/cylinder.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/cylinder.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/cylinder.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/fill.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/fill.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/fill.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/fill.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/flatten.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/flatten.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/flatten.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/flatten.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/frame.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/frame.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/frame.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/frame.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/horizon.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/horizon.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/horizon.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/horizon.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/pyramid.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/pyramid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/pyramid.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/pyramid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/stairs.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/stairs.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fillerPatterns/stairs.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/fillerPatterns/stairs.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockBlueLaser.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockBlueLaser.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockBlueLaser.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockBlueLaser.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockRedLaser.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockRedLaser.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockRedLaser.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockRedLaser.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockStripesLaser.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockStripesLaser.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockStripesLaser.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockStripesLaser.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockTransparentLaser.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockTransparentLaser.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockTransparentLaser.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/laserBox/blockTransparentLaser.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_dark.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_dark.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_dark.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_lit.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_blue_lit.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_blue_lit.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_cyan.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_cyan.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_cyan.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_cyan.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_dark.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_dark.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_dark.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_lit.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_green_lit.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_green_lit.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_dark.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_dark.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_dark.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_lit.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_red_lit.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_red_lit.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_dark.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_dark.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_dark.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_dark.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_lit.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_lit.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/texture_yellow_lit.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/texture_yellow_lit.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/transparent.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/transparent.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/transparent.png rename to buildcraft_resources/assets/buildcraftcore/textures/blocks/misc/transparent.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/buttons.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/buttons.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/buttons.png rename to buildcraft_resources/assets/buildcraftcore/textures/gui/buttons.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/generic_one_slot.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/generic_one_slot.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/generic_one_slot.png rename to buildcraft_resources/assets/buildcraftcore/textures/gui/generic_one_slot.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/generic_ui.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/generic_ui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/generic_ui.png rename to buildcraft_resources/assets/buildcraftcore/textures/gui/generic_ui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/icon_button.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/icon_button.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/icon_button.png rename to buildcraft_resources/assets/buildcraftcore/textures/gui/icon_button.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/ledger.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/ledger.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/ledger.png rename to buildcraft_resources/assets/buildcraftcore/textures/gui/ledger.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/list.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/list.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/list.png rename to buildcraft_resources/assets/buildcraftcore/textures/gui/list.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/slot.png b/buildcraft_resources/assets/buildcraftcore/textures/gui/slot.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/slot.png rename to buildcraft_resources/assets/buildcraftcore/textures/gui/slot.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/diamondGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/diamondGearItem.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/diamondGearItem.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/diamondGearItem.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/fillerParameters/arrow_down.png b/buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_down.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/fillerParameters/arrow_down.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_down.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/fillerParameters/arrow_up.png b/buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_up.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/fillerParameters/arrow_up.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/fillerParameters/arrow_up.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/goldGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/goldGearItem.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/goldGearItem.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/goldGearItem.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/energy.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/energy.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/energy.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/icons/energy.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_1.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_1.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_1.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_1.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_2.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_2.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_2.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_2.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_3.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_3.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_3.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_3.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_4.png b/buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_4.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/icons/guiicons_0_4.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/icons/guiicons_0_4.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/ironGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/ironGearItem.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/ironGearItem.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/ironGearItem.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/list.png b/buildcraft_resources/assets/buildcraftcore/textures/items/list/clean.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/list.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/list/clean.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/list_used.png b/buildcraft_resources/assets/buildcraftcore/textures/items/list/used.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/list_used.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/list/used.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/map_area.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/area.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/map_area.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/area.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/map_clean.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/clean.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/map_clean.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/clean.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/map_path.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/path.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/map_path.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/path.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/map_spot.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/spot.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/map_spot.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/spot.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/map_zone.png b/buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/zone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/map_zone.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/mapLocation/zone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/stoneGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/stoneGearItem.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/stoneGearItem.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/stoneGearItem.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_loop.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_loop.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_loop.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_loop.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_off.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_off.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_off.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_off.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_on.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_on.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_machinecontrol_on.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_machinecontrol_on.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_redstoneoutput.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_redstoneoutput.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_redstoneoutput.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/action_redstoneoutput.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_black.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_black.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_black.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_black.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_blue.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_blue.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_brown.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_brown.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_brown.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_brown.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_cyan.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_cyan.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_cyan.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_cyan.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_gray.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_gray.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_gray.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_gray.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_green.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_green.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_light_blue.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_light_blue.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_light_gray.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_gray.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_light_gray.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_light_gray.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_lime.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_lime.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_lime.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_lime.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_magenta.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_magenta.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_magenta.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_magenta.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_orange.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_orange.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_orange.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_orange.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_pink.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_pink.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_pink.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_pink.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_purple.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_purple.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_purple.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_purple.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_red.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_red.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_white.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_white.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_white.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_white.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/color_yellow.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/color_yellow.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/color_yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_gate_side_only.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/redstone_gate_side_only.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_gate_side_only.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/redstone_gate_side_only.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_down.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_down.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_down.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_down.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_east.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_east.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_east.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_east.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_north.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_north.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_north.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_north.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_south.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_south.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_south.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_south.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_up.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_up.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_up.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_up.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_west.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_west.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_dir_west.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_dir_west.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_energy_high.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_energy_storage_high.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_energy_high.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_energy_storage_high.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_energy_low.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_energy_storage_low.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_energy_low.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_energy_storage_low.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below25.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below25.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below25.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below25.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below50.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below50.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below50.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below50.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below75.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below75.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_below75.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_below75.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_contains.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_contains.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_contains.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_contains.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_empty.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_empty.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_empty.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_empty.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_full.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_full.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_full.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_full.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_space.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_space.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_inventory_space.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_inventory_space.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_below25.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below25.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_below25.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below25.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_below50.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below50.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_below50.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below50.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_below75.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below75.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_below75.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_below75.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_contains.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_contains.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_empty.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_empty.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_full.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_full.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_space.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_liquidcontainer_space.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_active.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_active.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_active.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_active.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_inactive.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_inactive.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_machine_inactive.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_machine_inactive.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_active.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_active.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png b/buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_inactive.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/triggers/trigger_redstoneinput_inactive.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/unknown.png b/buildcraft_resources/assets/buildcraftcore/textures/items/unknown.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/unknown.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/unknown.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/woodenGearItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/woodenGearItem.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/woodenGearItem.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/woodenGearItem.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/wrenchItem.png b/buildcraft_resources/assets/buildcraftcore/textures/items/wrenchItem.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/wrenchItem.png rename to buildcraft_resources/assets/buildcraftcore/textures/items/wrenchItem.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/blue_stripes.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/blue_stripes.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/blue_stripes.png rename to buildcraft_resources/assets/buildcraftcore/textures/laserBeams/blue_stripes.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/laser_1.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_1.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/laser_1.png rename to buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_1.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/laser_2.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_2.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/laser_2.png rename to buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_2.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/laser_3.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_3.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/laser_3.png rename to buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_3.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/laser_4.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_4.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/laser_4.png rename to buildcraft_resources/assets/buildcraftcore/textures/laserBeams/laser_4.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/stripes.png b/buildcraft_resources/assets/buildcraftcore/textures/laserBeams/stripes.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/stripes.png rename to buildcraft_resources/assets/buildcraftcore/textures/laserBeams/stripes.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/base_creative.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/base.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/base_creative.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/base.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chamber_creative.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/chamber.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/chamber_creative.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/chamber.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/trunk_creative.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/trunk.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/trunk_creative.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/trunk.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/base_iron.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/base.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/base_iron.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/base.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chamber_iron.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/chamber.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/chamber_iron.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/chamber.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineIronBottom.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/icon.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/engineIronBottom.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/icon.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/base_stone.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/base.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/base_stone.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/base.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chamber_stone.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/chamber.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/chamber_stone.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/chamber.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneBottom.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/icon.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/engineStoneBottom.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/icon.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fuel_flow.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fuel_flow.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fuel_flow.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fuel_flow.png.mcmeta rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_flow.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fuel_still.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fuel_still.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/fuel_still.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/fuel_still.png.mcmeta rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/fuel_still.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/oil_flow.png.mcmeta rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_flow.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/oil_still.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/oil_still.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/oil_still.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/oil_still.png.mcmeta rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/oil_still.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_flow.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_flow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_flow.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_flow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_flow.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_flow.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_flow.png.mcmeta rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_flow.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_still.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_still.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_still.png rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_still.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_still.png.mcmeta b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_still.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/redplasma_still.png.mcmeta rename to buildcraft_resources/assets/buildcraftenergy/textures/blocks/fluids/redplasma_still.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/combustion_engine_gui.png b/buildcraft_resources/assets/buildcraftenergy/textures/gui/combustion_engine_gui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/combustion_engine_gui.png rename to buildcraft_resources/assets/buildcraftenergy/textures/gui/combustion_engine_gui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/steam_engine_gui.png b/buildcraft_resources/assets/buildcraftenergy/textures/gui/steam_engine_gui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/steam_engine_gui.png rename to buildcraft_resources/assets/buildcraftenergy/textures/gui/steam_engine_gui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/bucketFuel.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketFuel.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/bucketFuel.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/bucketFuel.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/bucketOil.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketOil.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/bucketOil.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/bucketOil.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/bucketRedplasma.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/bucketRedplasma.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/bucketRedplasma.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/bucketRedplasma.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_blue.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_blue.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_green.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_green.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_overheat.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_overheat.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_overheat.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_overheat.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_red.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_red.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png b/buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png rename to buildcraft_resources/assets/buildcraftenergy/textures/items/triggers/trigger_engineheat_yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_side.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/topbottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/autoWorkbench_top.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/topbottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/floodgate_bottom.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/floodGateBlock/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/floodgate_bottom.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/floodGateBlock/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/floodgate_side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/floodGateBlock/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/floodgate_side.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/floodGateBlock/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/floodgate_top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/floodGateBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/floodgate_top.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/floodGateBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockFrame.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/frameBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockFrame.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/frameBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/hopperBottom.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/hopperBottom.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/hopper_middle.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/middle.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/hopper_middle.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/middle.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/hopper.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/hopper.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/quarry_side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/quarry_side.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillTexture.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillTexture.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillHeadTexture.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill_head.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockDrillHeadTexture.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/drill_head.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/quarry_front.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/front.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/quarry_front.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/front.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/quarry_top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/quarry_top.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/machineBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_back.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/back.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_back.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/back.png diff --git a/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/bottom.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/bottom.png new file mode 100644 index 00000000..6d240be0 Binary files /dev/null and b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/bottom.png differ diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_front.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/front.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_front.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/front.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_side.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/miningwell_top.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/miningWellBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/blockPlainPipe.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/plainPipeBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/blockPlainPipe.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/plainPipeBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pump_bottom.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pump_bottom.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pump_side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pump_side.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pump_top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pump_top.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pump_tube.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/tube.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pump_tube.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/tube.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/refineryBack.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/refineryBack.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/refinery.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/refinery.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/refinery.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/refineryBlock/refinery.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/tank_bottom_side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/tank_bottom_side.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/tank_stacked_side.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side_stacked.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/tank_stacked_side.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/side_stacked.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/tank_top.png b/buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/topbottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/tank_top.png rename to buildcraft_resources/assets/buildcraftfactory/textures/blocks/tankBlock/topbottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/autobench.png b/buildcraft_resources/assets/buildcraftfactory/textures/gui/autobench.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/autobench.png rename to buildcraft_resources/assets/buildcraftfactory/textures/gui/autobench.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/hopper_gui.png b/buildcraft_resources/assets/buildcraftfactory/textures/gui/hopper_gui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/hopper_gui.png rename to buildcraft_resources/assets/buildcraftfactory/textures/gui/hopper_gui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/refinery_filter.png b/buildcraft_resources/assets/buildcraftfactory/textures/gui/refinery_filter.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/refinery_filter.png rename to buildcraft_resources/assets/buildcraftfactory/textures/gui/refinery_filter.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/mailbox_front.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/front.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/mailbox_front.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/front.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/requester_side.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/requester_side.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/commander_side.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/topbottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/commander_side.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/blocks/requester/topbottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/zonePlan_side.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zonePlan/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/zonePlan_side.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zonePlan/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/zonePlan_front.png b/buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zonePlan/front.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/zonePlan_front.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zonePlan/front.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_base.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_base.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_base.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_base.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_bomber.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_bomber.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_bomber.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_bomber.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_builder.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_builder.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_builder.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_builder.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_builder_base.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_builder_base.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_builder_base.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_builder_base.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_butcher.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_butcher.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_butcher.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_butcher.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_carrier.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_carrier.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_carrier.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_carrier.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_crafter.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_crafter.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_crafter.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_crafter.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_delivery.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_delivery.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_delivery.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_delivery.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_factory.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_factory.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_factory.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_factory.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_farmer.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_farmer.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_farmer.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_farmer.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_fluid_carrier.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_fluid_carrier.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_fluid_carrier.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_fluid_carrier.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_harvester.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_harvester.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_harvester.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_harvester.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_knight.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_knight.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_knight.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_knight.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_leave_cutter.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_leave_cutter.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_leave_cutter.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_leave_cutter.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_lumberjack.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_lumberjack.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_lumberjack.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_lumberjack.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_military.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_military.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_military.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_military.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_miner.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_miner.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_miner.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_miner.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_overlay.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_overlay.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_overlay.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_overlay.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_picker.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_picker.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_picker.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_picker.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_planter.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_planter.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_planter.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_planter.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_pump.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_pump.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_pump.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_pump.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_shovelman.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_shovelman.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_shovelman.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_shovelman.png diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_stripes.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_stripes.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_stripes.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_stripes.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/requester_gui.png b/buildcraft_resources/assets/buildcraftrobotics/textures/gui/requester_gui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/requester_gui.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/gui/requester_gui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/map_gui.png b/buildcraft_resources/assets/buildcraftrobotics/textures/gui/zone_planner_gui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/map_gui.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/gui/zone_planner_gui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_blue.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/board_blue.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/board/blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_clean.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/clean.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/board_clean.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/board/clean.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_green.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/board_green.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/board/green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_red.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/board_red.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/board/red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_unknown.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/unknown.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/board_unknown.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/board/unknown.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/board_yellow.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/board/yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/board_yellow.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/board/yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_filter.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_filter.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_filter_tool.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter_tool.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_filter_tool.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_filter_tool.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_goto_station.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_goto_station.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_goto_station.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_goto_station.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_in_area.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_in_area.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_in_area.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_in_area.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_inventory.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_inventory.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_inventory.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_inventory.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_wakeup.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_wakeup.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_wakeup.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_wakeup.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_accept_fluids.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_fluids.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_accept_fluids.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_fluids.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_accept_items.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_items.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_accept_items.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_accept_items.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_allow_craft.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_allow_craft.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_allow_craft.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_allow_craft.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_drop_in_pipe.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_drop_in_pipe.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_drop_in_pipe.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_drop_in_pipe.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_machine_request.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_machine_request.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_machine_request.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_machine_request.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_provide_fluids.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_provide_fluids.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_provide_fluids.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_provide_fluids.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_provide_items.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_provide_items.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_provide_items.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_provide_items.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_request_items.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_request_items.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_request_items.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_request_items.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_robot_forbidden.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_forbidden.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_robot_forbidden.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_forbidden.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_robot_mandatory.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_mandatory.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_station_robot_mandatory.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_station_robot_mandatory.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_in_station.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_in_station.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_in_station.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_in_station.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_linked.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_linked.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_linked.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_linked.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_reserved.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_reserved.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_reserved.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_reserved.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_sleep.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_sleep.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_robot_sleep.png rename to buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/trigger_robot_sleep.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_bottom.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_side.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/advworkbenchtable_top.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/advancedCraftingTable/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_bottom.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_side.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/assemblytable_top.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/assemblyTable/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chargingtable_bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/chargingtable_bottom.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chargingtable_side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/chargingtable_side.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/chargingtable_top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/chargingtable_top.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/integrationtable_bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/integrationtable_bottom.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/integrationtable_side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/integrationtable_side.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/integrationtable_top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/integrationtable_top.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/integrationTable/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/laser_bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/laser_bottom.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/laser_side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/laser_side.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/laser_top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/laser_top.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/laserBlock/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_bottom.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/bottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_bottom.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/bottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_side.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/side.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_side.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/side.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_top.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/top.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_top.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/blocks/programmingTable/top.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/assembly_advancedworkbench.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_advancedworkbench.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/assembly_advancedworkbench.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_advancedworkbench.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/assembly_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_table.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/assembly_table.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/gui/assembly_table.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/charging_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/charging_table.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/charging_table.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/gui/charging_table.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/integration_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/integration_table.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/integration_table.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/gui/integration_table.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/programming_table.png b/buildcraft_resources/assets/buildcraftsilicon/textures/gui/programming_table.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/programming_table.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/gui/programming_table.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_comp_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_comp_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_comp_chipset.png.mcmeta b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_comp_chipset.png.mcmeta rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_comp_chipset.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_diamond_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_diamond_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_diamond_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_diamond_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_emerald_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_emerald_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_emerald_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_emerald_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_gold_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_gold_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_gold_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_iron_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_iron_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_iron_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_iron_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_pulsating_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_pulsating_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_pulsating_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_pulsating_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_quartz_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_quartz_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_quartz_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_quartz_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstone_red_chipset.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_red_chipset.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstone_red_chipset.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/chipset/redstone_red_chipset.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redstoneCrystal.png b/buildcraft_resources/assets/buildcraftsilicon/textures/items/redstoneCrystal.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redstoneCrystal.png rename to buildcraft_resources/assets/buildcraftsilicon/textures/items/redstoneCrystal.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/filteredBuffer_all.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/filteredBufferBlock/default.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/filteredBuffer_all.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/filteredBufferBlock/default.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_and.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_and.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_and_dark.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_dark.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_and_dark.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_dark.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_and_lit.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_lit.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_and_lit.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_lit.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_fader.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_fader.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_fader.png.mcmeta b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_fader.png.mcmeta rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_fader.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_pulsar.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_timer.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_timer.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_expansion_timer.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_timer.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_diamond.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_diamond.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_diamond.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_diamond.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_emerald.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_emerald.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_emerald.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_emerald.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_gold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_gold.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_gold.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_gold.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_iron.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_iron.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_iron.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_iron.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_quartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_quartz.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_material_quartz.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_quartz.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_or.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_or.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_or_dark.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_dark.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_or_dark.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_dark.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_or_lit.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_lit.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/gates/gate_or_lit.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or_lit.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/itemBox.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/itemBox.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/itemBox.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/itemBox.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllDaizuli_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllDaizuli_solid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllDaizuli_solid.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllDaizuli_solid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllEmerald_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmerald_solid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllEmerald_solid.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmerald_solid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllEmzuli_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmzuli_solid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllEmzuli_solid.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmzuli_solid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllIron_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllIron_solid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllIron_solid.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllIron_solid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllWood_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllWood_solid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeAllWood_solid.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllWood_solid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFilter.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFilter.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFilter.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFilter.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsCobblestone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsCobblestone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsCobblestone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_center.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_center.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_center.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_center.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_down.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_down.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_down.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_down.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_east.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_east.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_east.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_east.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_item.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_item.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_item.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_item.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_north.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_north.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_north.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_north.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_south.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_south.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_south.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_south.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_up.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_up.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_up.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_up.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_west.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_west.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_west_cb.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west_cb.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsDiamond_west_cb.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west_cb.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsEmerald_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsEmerald_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsEmerald_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsEmerald_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsGold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsGold.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsGold.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsGold.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsIron_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsIron_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsIron_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsIron_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsQuartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsQuartz.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsQuartz.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsQuartz.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsSandstone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsSandstone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsSandstone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsSandstone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsStone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsStone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsStone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsStone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsVoid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsVoid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsVoid.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsVoid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsWood_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsWood_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeFluidsWood_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsWood_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsClay.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsClay.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsClay.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsClay.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsCobblestone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsCobblestone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsCobblestone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_black.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_black.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_black.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_black.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_blue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_blue.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_brown.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_brown.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_brown.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_brown.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_cyan.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_cyan.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_cyan.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_cyan.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_gray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_gray.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_gray.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_gray.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_green.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_green.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_lightblue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightblue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_lightblue.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightblue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_lightgray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightgray.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_lightgray.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lightgray.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_lime.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lime.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_lime.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_lime.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_magenta.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_magenta.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_magenta.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_magenta.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_orange.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_orange.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_orange.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_orange.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_pink.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_pink.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_pink.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_pink.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_purple.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_purple.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_purple.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_purple.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_red.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_red.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_white.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_white.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_white.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_white.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_yellow.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDaizuli_yellow.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDaizuli_yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_center.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_center.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_center.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_center.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_down.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_down.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_down.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_down.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_east.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_east.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_east.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_east.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_item.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_item.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_item.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_item.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_north.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_north.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_north.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_north.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_south.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_south.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_south.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_south.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_up.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_up.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_up.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_up.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_west.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_west.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_west_cb.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west_cb.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsDiamond_west_cb.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west_cb.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsEmerald_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmerald_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsEmerald_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmerald_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsEmzuli_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmzuli_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsEmzuli_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmzuli_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsGold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsGold.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsGold.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsGold.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsIron_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsIron_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsIron_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsIron_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_black.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_black.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_black.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_black.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_blue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_blue.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_brown.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_brown.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_brown.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_brown.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_cyan.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_cyan.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_cyan.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_cyan.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_gray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_gray.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_gray.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_gray.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_green.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_green.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_lightblue.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightblue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_lightblue.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightblue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_lightgray.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightgray.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_lightgray.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lightgray.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_lime.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lime.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_lime.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_lime.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_magenta.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_magenta.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_magenta.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_magenta.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_orange.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_orange.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_orange.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_orange.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_pink.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_pink.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_pink.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_pink.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_purple.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_purple.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_purple.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_purple.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_red.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_red.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_white.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_white.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_white.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_white.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_yellow.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsLapis_yellow.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsLapis_yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsObsidian.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsObsidian.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsObsidian.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsObsidian.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsQuartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsQuartz.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsQuartz.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsQuartz.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsSandstone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsSandstone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsSandstone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsSandstone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsStone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsStone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsStone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsStone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsVoid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsVoid.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsVoid.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsVoid.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsWood_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsWood_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeItemsWood_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsWood_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeLens.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLens.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeLens.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLens.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeLensOverlay.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLensOverlay.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeLensOverlay.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeLensOverlay.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerAdapterBottom.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterBottom.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerAdapterBottom.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterBottom.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerAdapterSide.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterSide.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerAdapterSide.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterSide.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerAdapterTop.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterTop.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerAdapterTop.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerAdapterTop.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerCobblestone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerCobblestone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerCobblestone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerDiamond.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerDiamond.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerDiamond.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerDiamond.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerEmerald_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerEmerald_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerEmerald_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerEmerald_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerGold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerGold.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerGold.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerGold.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM128.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM128.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM128.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM128.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM16.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM16.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM16.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM16.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM2.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM2.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM2.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM2.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM32.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM32.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM32.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM32.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM4.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM4.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM4.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM4.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM64.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM64.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM64.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM64.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM8.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM8.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerIronM8.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerIronM8.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerQuartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerQuartz.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerQuartz.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerQuartz.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerSandstone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerSandstone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerSandstone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerSandstone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerStone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerStone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerStone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerStone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerWood_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerWood_standard.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipePowerWood_standard.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerWood_standard.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeRobotStation.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeRobotStation.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeRobotStation.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeRobotStation.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeRobotStationLinked.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeRobotStationLinked.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeRobotStationLinked.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeRobotStationLinked.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeRobotStationReserved.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeRobotStationReserved.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeRobotStationReserved.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeRobotStationReserved.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeStainedOverlay.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStainedOverlay.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeStainedOverlay.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStainedOverlay.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeStripes.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStripes.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeStripes.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStripes.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/pipeStructureCobblestone.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStructureCobblestone.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/pipeStructureCobblestone.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeStructureCobblestone.png diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/transparent_facade.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/transparent_facade.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/blocks/transparent_facade.png rename to buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/transparent_facade.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/filter.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/filter.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/filter.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/filter_cb.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_cb.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/filter_cb.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/filter_cb.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/filteredBuffer_gui.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/filteredBuffer_gui.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/filteredBuffer_gui.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/filteredBuffer_gui.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_1.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_1.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_1.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_1.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_2.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_2.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_2.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_2.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_3.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_3.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_3.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_3.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_4.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_4.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_5.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_5.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_6.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_6.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/gate_interface_6.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_6.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/pipe_emerald.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emerald.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/pipe_emerald.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emerald.png diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/pipe_emzuli.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emzuli.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/gui/pipe_emzuli.png rename to buildcraft_resources/assets/buildcrafttransport/textures/gui/pipe_emzuli.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gateCopierOff.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/empty.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gateCopierOff.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/empty.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gateCopierOn.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/full.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gateCopierOn.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gateCopier/full.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_clock.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_clock.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_clock.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_clock.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_fader.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_fader.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_fader.png.mcmeta b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png.mcmeta similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_fader.png.mcmeta rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_fader.png.mcmeta diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_pulsar.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_pulsar.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_timer.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_timer.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_expansion_timer.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_expansion_timer.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_logic_and.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_and.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_logic_and.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_and.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_logic_or.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_or.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_logic_or.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_logic_or.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_diamond.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_diamond.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_diamond.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_diamond.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_emerald.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_emerald.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_emerald.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_emerald.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_gold.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_gold.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_gold.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_gold.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_iron.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_iron.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_iron.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_iron.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_quartz.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_quartz.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/gates/gate_material_quartz.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/gates/gate_material_quartz.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/pipeFilterItem0.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/filterFrame.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/pipeFilterItem0.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/lens/filterFrame.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/pipeLensItem0.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/lensFrame.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/pipeLensItem0.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/lens/lensFrame.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/pipeLensItem1.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/lens/transparent.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/pipeLensItem1.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/lens/transparent.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/pipeWaterproof.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWaterproof.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/pipeWaterproof.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWaterproof.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/bluePipeWire.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/bluePipeWire.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/greenPipeWire.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/greenPipeWire.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/redPipeWire.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/redPipeWire.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/yellowPipeWire.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/yellowPipeWire.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/pipeWire/yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_pulsar.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_pulsar.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_pulsar.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_single_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_single_pulsar.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_single_pulsar.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_single_pulsar.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_closed.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_closed.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_closed.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_closed.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_input_only.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_input_only.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_input_only.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_input_only.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_open.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_open.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_open.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_open.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_output_only.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_output_only.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/action_valve_output_only.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/action_valve_output_only.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_blue.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_blue.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_blue.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_blue.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_green.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_green.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_green.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_green.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_red.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_red.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_red.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_red.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_yellow.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_yellow.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/extraction_preset_yellow.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/extraction_preset_yellow.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_3_4.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/guitriggers_3_4.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/guitriggers_3_4.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/guitriggers_3_4.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_01.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_01.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_01.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_01.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_02.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_02.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_02.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_02.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_03.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_03.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_03.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_03.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_04.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_04.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_04.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_04.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_05.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_05.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_05.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_05.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_06.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_06.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_06.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_06.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_07.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_07.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_07.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_07.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_08.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_08.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_08.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_08.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_09.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_09.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_09.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_09.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_10.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_10.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_10.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_10.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_11.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_11.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_11.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_11.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_12.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_12.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_12.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_12.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_13.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_13.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_13.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_13.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_14.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_14.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_14.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_14.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_15.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_15.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/redstone_15.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/redstone_15.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m128.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m128.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m128.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m128.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m16.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m16.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m16.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m16.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m2.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m2.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m2.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m2.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m32.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m32.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m32.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m32.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m4.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m4.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m4.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m4.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m64.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m64.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m64.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m64.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m8.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m8.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_limiter_m8.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_limiter_m8.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsenergy.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsenergy.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsfluids.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsfluids.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsfluids.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsfluids.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsitems.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_containsitems.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_empty.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_empty.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_requestsenergy.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_requestsenergy.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_requestsenergy.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_requestsenergy.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_toomuchenergy.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_toomuchenergy.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipecontents_toomuchenergy.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipecontents_toomuchenergy.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_active.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_active.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_inactive.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_blue_inactive.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_active.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_active.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_inactive.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_green_inactive.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_active.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_active.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_inactive.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_inactive.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_active.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_active.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_inactive.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_yellow_inactive.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_timer_long.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_long.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_timer_long.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_long.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_timer_medium.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_medium.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_timer_medium.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_medium.png diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_timer_short.png b/buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_short.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/items/triggers/trigger_timer_short.png rename to buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_timer_short.png diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 057e6bcf..91fa67db 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -448,10 +448,10 @@ public class BuildCraftCore extends BuildCraftMod { iconProvider.registerIcons(event.map); EnumColor.registerIcons(event.map); } else if (event.map.getTextureType() == 0) { - BuildCraftCore.redLaserTexture = event.map.registerIcon("buildcraft:blockRedLaser"); - BuildCraftCore.blueLaserTexture = event.map.registerIcon("buildcraft:blockBlueLaser"); - BuildCraftCore.stripesLaserTexture = event.map.registerIcon("buildcraft:blockStripesLaser"); - BuildCraftCore.transparentTexture = event.map.registerIcon("buildcraft:blockTransparentLaser"); + BuildCraftCore.redLaserTexture = event.map.registerIcon("buildcraftcore:laserBox/blockRedLaser"); + BuildCraftCore.blueLaserTexture = event.map.registerIcon("buildcraftcore:laserBox/blockBlueLaser"); + BuildCraftCore.stripesLaserTexture = event.map.registerIcon("buildcraftcore:laserBox/blockStripesLaser"); + BuildCraftCore.transparentTexture = event.map.registerIcon("buildcraftcore:laserBox/blockTransparentLaser"); } } diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 70ecf42c..36b553f7 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -56,7 +56,7 @@ import buildcraft.core.InterModComms; import buildcraft.core.Version; import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.proxy.CoreProxy; -import buildcraft.energy.BlockBuildcraftFluid; +import buildcraft.core.lib.block.BlockBuildCraftFluid; import buildcraft.energy.BucketHandler; import buildcraft.energy.EnergyProxy; import buildcraft.energy.EnergyGuiHandler; @@ -200,7 +200,7 @@ public class BuildCraftEnergy extends BuildCraftMod { fluidRedPlasma = FluidRegistry.getFluid("redplasma"); if (fluidOil.getBlock() == null) { - blockOil = new BlockBuildcraftFluid(fluidOil, Material.water, MapColor.blackColor).setFlammable(canOilBurn).setFlammability(0).setDense(isOilDense); + blockOil = new BlockBuildCraftFluid(fluidOil, Material.water, MapColor.blackColor).setFlammable(canOilBurn).setFlammability(0).setDense(isOilDense); blockOil.setBlockName("blockOil").setLightOpacity(8); CoreProxy.proxy.registerBlock(blockOil); fluidOil.setBlock(blockOil); @@ -215,7 +215,7 @@ public class BuildCraftEnergy extends BuildCraftMod { } if (fluidFuel.getBlock() == null) { - blockFuel = new BlockBuildcraftFluid(fluidFuel, Material.water, MapColor.yellowColor).setFlammable(true).setFlammability(5).setParticleColor(0.7F, 0.7F, 0.0F); + blockFuel = new BlockBuildCraftFluid(fluidFuel, Material.water, MapColor.yellowColor).setFlammable(true).setFlammability(5).setParticleColor(0.7F, 0.7F, 0.0F); blockFuel.setBlockName("blockFuel").setLightOpacity(3); CoreProxy.proxy.registerBlock(blockFuel); fluidFuel.setBlock(blockFuel); @@ -224,7 +224,7 @@ public class BuildCraftEnergy extends BuildCraftMod { } if (fluidRedPlasma.getBlock() == null) { - blockRedPlasma = new BlockBuildcraftFluid(fluidRedPlasma, Material.water, MapColor.redColor).setFlammable( + blockRedPlasma = new BlockBuildCraftFluid(fluidRedPlasma, Material.water, MapColor.redColor).setFlammable( false).setParticleColor(0.9F, 0, 0); blockRedPlasma.setBlockName("blockRedPlasma"); CoreProxy.proxy.registerBlock(blockRedPlasma); diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 8e4e051c..9a833ea0 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -353,9 +353,9 @@ public class BuildCraftFactory extends BuildCraftMod { public void loadTextures(TextureStitchEvent.Pre evt) { if (evt.map.getTextureType() == 0) { TextureMap terrainTextures = evt.map; - FactoryProxyClient.pumpTexture = terrainTextures.registerIcon("buildcraft:pump_tube"); - FactoryProxyClient.drillTexture = terrainTextures.registerIcon("buildcraft:blockDrillTexture"); - FactoryProxyClient.drillHeadTexture = terrainTextures.registerIcon("buildcraft:blockDrillHeadTexture"); + FactoryProxyClient.pumpTexture = terrainTextures.registerIcon("buildcraftfactory:pumpBlock/tube"); + FactoryProxyClient.drillTexture = terrainTextures.registerIcon("buildcraftfactory:machineBlock/drill"); + FactoryProxyClient.drillHeadTexture = terrainTextures.registerIcon("buildcraftfactory:machineBlock/drill_head"); } } diff --git a/common/buildcraft/BuildCraftRobotics.java b/common/buildcraft/BuildCraftRobotics.java index 544f004c..51d371d1 100644 --- a/common/buildcraft/BuildCraftRobotics.java +++ b/common/buildcraft/BuildCraftRobotics.java @@ -142,6 +142,8 @@ import buildcraft.robotics.statements.ActionStationRequestItems; import buildcraft.robotics.statements.ActionStationRequestItemsMachine; import buildcraft.robotics.statements.RobotsActionProvider; import buildcraft.robotics.statements.RobotsTriggerProvider; +import buildcraft.robotics.statements.TriggerRobotInStation; +import buildcraft.robotics.statements.TriggerRobotLinked; import buildcraft.robotics.statements.TriggerRobotSleep; import buildcraft.silicon.ItemRedstoneChipset; @@ -158,6 +160,9 @@ public class BuildCraftRobotics extends BuildCraftMod { public static Item robotStationItem; public static ITriggerInternal triggerRobotSleep = new TriggerRobotSleep(); + public static ITriggerInternal triggerRobotInStation = new TriggerRobotInStation(); + public static ITriggerInternal triggerRobotLinked = new TriggerRobotLinked(false); + public static ITriggerInternal triggerRobotReserved = new TriggerRobotLinked(true); public static IActionInternal actionRobotGotoStation = new ActionRobotGotoStation(); public static IActionInternal actionRobotWakeUp = new ActionRobotWakeUp(); @@ -170,7 +175,8 @@ public class BuildCraftRobotics extends BuildCraftMod { public static IActionInternal actionStationProvideItems = new ActionStationProvideItems(); public static IActionInternal actionStationAcceptFluids = new ActionStationAcceptFluids(); public static IActionInternal actionStationProvideFluids = new ActionStationProvideFluids(); - public static IActionInternal actionStationForbidRobot = new ActionStationForbidRobot(); + public static IActionInternal actionStationForceRobot = new ActionStationForbidRobot(true); + public static IActionInternal actionStationForbidRobot = new ActionStationForbidRobot(true); public static IActionInternal actionStationDropInPipe = new ActionStationAcceptItemsPipe(); public static IActionInternal actionStationMachineRequestItems = new ActionStationRequestItemsMachine(); diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 8ace2480..837f1566 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -8,39 +8,24 @@ */ package buildcraft.builders; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftBuilders; -import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.api.tools.IToolWrench; import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; -import buildcraft.core.lib.utils.Utils; public class BlockArchitect extends BlockBuildCraft { - IIcon blockTextureTop; - IIcon blockTextureSide; - IIcon blockTextureFront; - public BlockArchitect() { super(Material.iron, BCCreativeTab.get("main")); + setRotatable(true); } @Override @@ -51,72 +36,23 @@ public class BlockArchitect extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - - // Drop through if the player is sneaking - if (entityplayer.isSneaking()) { - return false; - } - - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; + if (super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9)) { + return true; } Item equipped = entityplayer.getCurrentEquippedItem() != null ? entityplayer.getCurrentEquippedItem().getItem() : null; - if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(entityplayer, x, y, z)) { - - int meta = world.getBlockMetadata(x, y, z); - - switch (ForgeDirection.values()[meta]) { - case WEST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.SOUTH.ordinal(), 0); - break; - case EAST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.NORTH.ordinal(), 0); - break; - case NORTH: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.WEST.ordinal(), 0); - break; - case SOUTH: - default: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.EAST.ordinal(), 0); - break; - } - - world.markBlockForUpdate(x, y, z); - ((IToolWrench) equipped).wrenchUsed(entityplayer, x, y, z); - return true; - } else if (equipped instanceof ItemConstructionMarker) { + if (equipped instanceof ItemConstructionMarker) { ItemConstructionMarker.link(entityplayer.getCurrentEquippedItem(), world, x, y, z); return true; } else { - if (!world.isRemote) { entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.ARCHITECT_TABLE, world, x, y, z); } return true; - } } - @Override - public void breakBlock(World world, int i, int j, int k, Block block, int par6) { - Utils.preDestroyBlock(world, i, j, k); - - super.breakBlock(world, i, j, k, block, par6); - } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - - ForgeDirection orientation = Utils.get2dOrientation(entityliving); - - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); - } - @Override public boolean renderAsNormalBlock() { return false; @@ -131,31 +67,4 @@ public class BlockArchitect extends BlockBuildCraft { public int getLightValue(IBlockAccess world, int x, int y, int z) { return 1; } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int j) { - if (j == 0 && i == 3) { - return blockTextureFront; - } - - if (i == j) { - return blockTextureFront; - } - - switch (i) { - case 1: - return blockTextureTop; - default: - return blockTextureSide; - } - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockTextureTop = par1IconRegister.registerIcon("buildcraft:architect_top"); - blockTextureSide = par1IconRegister.registerIcon("buildcraft:architect_side"); - blockTextureFront = par1IconRegister.registerIcon("buildcraft:architect_front"); - } } diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 7e706bb5..64f5e322 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -26,26 +26,17 @@ import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; public class BlockBlueprintLibrary extends BlockBuildCraft { - - private IIcon textureTop; - private IIcon textureSide; - public BlockBlueprintLibrary() { super(Material.wood, BCCreativeTab.get("main")); } @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9); - - // Drop through if the player is sneaking - if (entityplayer.isSneaking()) { - return false; + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; } - - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { + + if (entityplayer.isSneaking()) { return false; } @@ -63,22 +54,4 @@ public class BlockBlueprintLibrary extends BlockBuildCraft { public TileEntity createNewTileEntity(World world, int metadata) { return new TileBlueprintLibrary(); } - - @Override - public IIcon getIcon(int i, int j) { - switch (i) { - case 0: - case 1: - return textureTop; - default: - return textureSide; - } - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcon("buildcraft:library_topbottom"); - textureSide = par1IconRegister.registerIcon("buildcraft:library_side"); - } } diff --git a/common/buildcraft/builders/BlockBuildTool.java b/common/buildcraft/builders/BlockBuildTool.java index 79bd2b02..8b553ba8 100755 --- a/common/buildcraft/builders/BlockBuildTool.java +++ b/common/buildcraft/builders/BlockBuildTool.java @@ -32,6 +32,6 @@ public class BlockBuildTool extends Block { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { - texture = par1IconRegister.registerIcon("buildcraft:blockRedLaser"); + texture = par1IconRegister.registerIcon("buildcraftcore:laserBox/blockRedLaser"); } } diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 2f401555..52d178a0 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -45,6 +45,7 @@ public class BlockBuilder extends BlockBuildCraft { super(Material.iron); setHardness(5F); setCreativeTab(BCCreativeTab.get("main")); + setRotatable(true); } @Override @@ -52,35 +53,13 @@ public class BlockBuilder extends BlockBuildCraft { return new TileBuilder(); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int j) { - if (j == 0 && i == 3) { - return blockTextureFront; - } - - if (i == j) { - return blockTextureFront; - } - - switch (i) { - case 1: - return blockTextureTop; - default: - return blockTextureSide; - } - } - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - - // Drop through if the player is sneaking - if (entityplayer.isSneaking()) { - return false; + if (super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9)) { + return true; } - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { + + if (entityplayer.isSneaking()) { return false; } @@ -88,30 +67,7 @@ public class BlockBuilder extends BlockBuildCraft { TileBuilder builder = tile instanceof TileBuilder ? (TileBuilder) tile : null; Item equipped = entityplayer.getCurrentEquippedItem() != null ? entityplayer.getCurrentEquippedItem().getItem() : null; - if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(entityplayer, x, y, z)) { - int meta = world.getBlockMetadata(x, y, z); - - switch (ForgeDirection.values()[meta]) { - case WEST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.SOUTH.ordinal(), 0); - break; - case EAST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.NORTH.ordinal(), 0); - break; - case NORTH: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.WEST.ordinal(), 0); - break; - case SOUTH: - default: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.EAST.ordinal(), 0); - break; - } - - world.markBlockForUpdate(x, y, z); - ((IToolWrench) equipped).wrenchUsed(entityplayer, x, y, z); - - return true; - } else if (equipped instanceof ItemConstructionMarker) { + if (equipped instanceof ItemConstructionMarker) { if (ItemConstructionMarker.linkStarted(entityplayer.getCurrentEquippedItem())) { ItemConstructionMarker.link(entityplayer.getCurrentEquippedItem(), world, x, y, z); } @@ -128,28 +84,6 @@ public class BlockBuilder extends BlockBuildCraft { } } - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - ForgeDirection orientation = Utils.get2dOrientation(entityliving); - - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) { - Utils.preDestroyBlock(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockTextureTop = par1IconRegister.registerIcon("buildcraft:builder_top"); - blockTextureSide = par1IconRegister.registerIcon("buildcraft:builder_side"); - blockTextureFront = par1IconRegister.registerIcon("buildcraft:builder_front"); - } - @Override public boolean renderAsNormalBlock() { return false; diff --git a/common/buildcraft/builders/BlockConstructionMarker.java b/common/buildcraft/builders/BlockConstructionMarker.java index 95184508..7d2db7d4 100755 --- a/common/buildcraft/builders/BlockConstructionMarker.java +++ b/common/buildcraft/builders/BlockConstructionMarker.java @@ -26,7 +26,6 @@ import buildcraft.api.events.BlockInteractionEvent; import buildcraft.core.lib.utils.Utils; public class BlockConstructionMarker extends BlockMarker { - public BlockConstructionMarker() { } @@ -51,12 +50,6 @@ public class BlockConstructionMarker extends BlockMarker { super.breakBlock(world, x, y, z, block, par6); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = par1IconRegister.registerIcon("buildcraft:constructMarker"); - } - @Override public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { super.onBlockPlacedBy(world, i, j, k, entityliving, stack); @@ -68,12 +61,8 @@ public class BlockConstructionMarker extends BlockMarker { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9); - - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; + if (super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9)) { + return true; } TileConstructionMarker marker = (TileConstructionMarker) world.getTileEntity(x, y, z); diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 13e26472..f3219f00 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -32,10 +32,6 @@ import buildcraft.core.GuiIds; import buildcraft.core.lib.utils.Utils; public class BlockFiller extends BlockBuildCraft { - - public IFillerPattern currentPattern; - private IIcon textureSides; - private IIcon textureTopOn; private IIcon textureTopOff; public BlockFiller() { @@ -47,15 +43,11 @@ public class BlockFiller extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - - // Drop through if the player is sneaking - if (entityplayer.isSneaking()) { - return false; + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; } - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { + if (entityplayer.isSneaking()) { return false; } @@ -67,35 +59,23 @@ public class BlockFiller extends BlockBuildCraft { } @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int m = world.getBlockMetadata(x, y, z); + @SideOnly(Side.CLIENT) + public IIcon getIconAbsolute(IBlockAccess world, int x, int y, int z, int side, int metadata) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile != null && tile instanceof TileFiller) { TileFiller filler = (TileFiller) tile; - if (side == 1 || side == 0) { + if (side != 1) { + if (filler.currentPattern != null) { + return filler.currentPattern.getIcon(); + } + } else { if (!filler.hasWork()) { return textureTopOff; - } else { - return textureTopOn; } - } else if (filler.currentPattern != null) { - return filler.currentPattern.getIcon(); - } else { - return textureSides; } } - return getIcon(side, m); - } - - @Override - public IIcon getIcon(int i, int j) { - if (i == 0 || i == 1) { - return textureTopOn; - } else { - return textureSides; - } + return super.getIconAbsolute(side, metadata); } @Override @@ -103,18 +83,11 @@ public class BlockFiller extends BlockBuildCraft { return new TileFiller(); } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) { - Utils.preDestroyBlock(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } - @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - textureTopOn = par1IconRegister.registerIcon("buildcraft:blockFillerTopOn"); - textureTopOff = par1IconRegister.registerIcon("buildcraft:blockFillerTopOff"); - textureSides = par1IconRegister.registerIcon("buildcraft:blockFillerSides"); + public void registerBlockIcons(IIconRegister register) { + super.registerBlockIcons(register); + textureTopOff = register.registerIcon("buildcraftbuilders:fillerBlock/top_off"); } @Override diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index 7a8bafef..c36c6811 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -86,10 +86,6 @@ public class BlockMarker extends BlockBuildCraft { return BuildCraftCore.markerModel; } - public boolean isACube() { - return false; - } - @Override public TileEntity createNewTileEntity(World world, int metadata) { return new TileMarker(); @@ -97,14 +93,12 @@ public class BlockMarker extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - if (entityplayer.inventory.getCurrentItem() != null - && entityplayer.inventory.getCurrentItem().getItem() instanceof IMapLocation) { - return false; + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; } - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { + if (entityplayer.inventory.getCurrentItem() != null + && entityplayer.inventory.getCurrentItem().getItem() instanceof IMapLocation) { return false; } @@ -115,12 +109,6 @@ public class BlockMarker extends BlockBuildCraft { return true; } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) { - Utils.preDestroyBlock(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } - @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int i, int j, int k) { return null; @@ -169,10 +157,4 @@ public class BlockMarker extends BlockBuildCraft { world.setBlockToAir(x, y, z); } } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon("buildcraft:blockMarker"); - } } diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index 73c5a976..2231f9dd 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -33,28 +33,20 @@ public class BlockPathMarker extends BlockMarker { } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) { - Utils.preDestroyBlock(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } + public IIcon getIconAbsolute(IBlockAccess iblockaccess, int x, int y, int z, int side, int metadata) { + TilePathMarker marker = (TilePathMarker) iblockaccess.getTileEntity(x, y, z); - @Override - @SuppressWarnings({ "all" }) - // @Override (client only) - public IIcon getIcon(IBlockAccess iblockaccess, int i, int j, int k, int l) { - TilePathMarker marker = (TilePathMarker) iblockaccess.getTileEntity(i, j, k); - - if (l == 1 || (marker != null && marker.tryingToConnect)) { + if (side == 1 || (marker != null && marker.tryingToConnect)) { return activeMarker; } else { - return super.getIcon(iblockaccess, i, j, k, l); + return super.getIconAbsolute(side, metadata); } } @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = par1IconRegister.registerIcon("buildcraft:blockPathMarker"); - activeMarker = par1IconRegister.registerIcon("buildcraft:blockPathMarkerActive"); + super.registerBlockIcons(par1IconRegister); + activeMarker = par1IconRegister.registerIcon("buildcraftbuilders:pathMarkerBlock/active"); } } diff --git a/common/buildcraft/builders/ItemBlueprint.java b/common/buildcraft/builders/ItemBlueprint.java index 02d6e6d1..3e087874 100644 --- a/common/buildcraft/builders/ItemBlueprint.java +++ b/common/buildcraft/builders/ItemBlueprint.java @@ -13,6 +13,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.BuildingPermission; @@ -89,4 +90,22 @@ public abstract class ItemBlueprint extends ItemBuildCraft { public static BlueprintBase loadBlueprint(ItemStack stack) { return BuildCraftBuilders.serverDB.load(getId(stack)); } + + public abstract String getIconType(); + + @Override + public String[] getIconNames() { + return new String[]{ getIconType() + "/clean", getIconType() + "/used" }; + } + + @Override + public IIcon getIconIndex(ItemStack stack) { + if (!NBTUtils.getItemData(stack).hasKey("name")) { + itemIcon = icons[0]; + } else { + itemIcon = icons[1]; + } + + return itemIcon; + } } diff --git a/common/buildcraft/builders/ItemBlueprintStandard.java b/common/buildcraft/builders/ItemBlueprintStandard.java index 5da1e7d5..ad481f13 100644 --- a/common/buildcraft/builders/ItemBlueprintStandard.java +++ b/common/buildcraft/builders/ItemBlueprintStandard.java @@ -8,38 +8,13 @@ */ package buildcraft.builders; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.core.lib.utils.NBTUtils; - public class ItemBlueprintStandard extends ItemBlueprint { - private IIcon cleanBlueprint; - private IIcon usedBlueprint; - public ItemBlueprintStandard() { super(); } @Override - public IIcon getIconIndex(ItemStack stack) { - if (!NBTUtils.getItemData(stack).hasKey("name")) { - itemIcon = cleanBlueprint; - } else { - itemIcon = usedBlueprint; - } - - return itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - cleanBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_clean"); - usedBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_used"); + public String getIconType() { + return "blueprint"; } } diff --git a/common/buildcraft/builders/ItemBlueprintTemplate.java b/common/buildcraft/builders/ItemBlueprintTemplate.java index 73108999..58672246 100644 --- a/common/buildcraft/builders/ItemBlueprintTemplate.java +++ b/common/buildcraft/builders/ItemBlueprintTemplate.java @@ -8,38 +8,13 @@ */ package buildcraft.builders; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.core.lib.utils.NBTUtils; - public class ItemBlueprintTemplate extends ItemBlueprint { - private IIcon cleanTemplate; - private IIcon usedTemplate; - public ItemBlueprintTemplate() { super(); } @Override - public IIcon getIconIndex(ItemStack stack) { - if (!NBTUtils.getItemData(stack).hasKey("name")) { - itemIcon = cleanTemplate; - } else { - itemIcon = usedTemplate; - } - - return itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - cleanTemplate = par1IconRegister.registerIcon("buildcraft:template_clean"); - usedTemplate = par1IconRegister.registerIcon("buildcraft:template_used"); + public String getIconType() { + return "template"; } } diff --git a/common/buildcraft/builders/ItemConstructionMarker.java b/common/buildcraft/builders/ItemConstructionMarker.java index 3e7eb915..2772c9e0 100755 --- a/common/buildcraft/builders/ItemConstructionMarker.java +++ b/common/buildcraft/builders/ItemConstructionMarker.java @@ -97,8 +97,8 @@ public class ItemConstructionMarker extends ItemBlock { public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); - iconBase = par1IconRegister.registerIcon("buildcraft:constructMarker"); - iconRecording = par1IconRegister.registerIcon("buildcraft:constructMarkerRec"); + iconBase = par1IconRegister.registerIcon("buildcraftbuilders:constructionMarkerBlock/default"); + iconRecording = par1IconRegister.registerIcon("buildcraftbuilders:constructionMarkerBlock/recording"); } @Override diff --git a/common/buildcraft/builders/gui/GuiArchitect.java b/common/buildcraft/builders/gui/GuiArchitect.java index 9a2b72d4..c16b29c6 100644 --- a/common/buildcraft/builders/gui/GuiArchitect.java +++ b/common/buildcraft/builders/gui/GuiArchitect.java @@ -40,7 +40,7 @@ public class GuiArchitect extends GuiBuildCraft { private static final int TEXT_HEIGHT = 12; private static final ResourceLocation TEXTURE = new ResourceLocation( - "buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/architect_gui.png"); + "buildcraftbuilders:textures/gui/architect_gui.png"); private TileArchitect architect; diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index dd13a507..ddc451d4 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -24,7 +24,7 @@ import buildcraft.core.lib.utils.StringUtils; public class GuiBlueprintLibrary extends GuiBuildCraft { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/library_rw.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/library_rw.png"); private GuiButton nextPageButton; private GuiButton prevPageButton; private GuiButton deleteButton; diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index b9647ef2..66699fba 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -32,8 +32,8 @@ import buildcraft.core.lib.network.command.PacketCommand; import buildcraft.core.lib.utils.StringUtils; public class GuiBuilder extends GuiAdvancedInterface { - private static final ResourceLocation BLUEPRINT_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/builder_blueprint.png"); - private static final ResourceLocation FOREGROUND_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/builder_foreground.png"); + private static final ResourceLocation BLUEPRINT_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/builder_blueprint.png"); + private static final ResourceLocation FOREGROUND_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/builder_foreground.png"); private IInventory playerInventory; private TileBuilder builder; private GuiButton selectedButton; diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 94f0cd84..f09b3707 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -36,8 +36,6 @@ public class GuiFiller extends GuiAdvancedInterface { @Override public IStatementParameter getParameter() { - System.out.println("getParameter " + slot + " " + instance.filler.patternParameters.length); - if (slot >= instance.filler.patternParameters.length) { return null; } else { @@ -51,7 +49,7 @@ public class GuiFiller extends GuiAdvancedInterface { } } - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filler.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/filler.png"); private final IInventory playerInventory; private final TileFiller filler; private final GuiFiller instance; diff --git a/common/buildcraft/builders/urbanism/GuiUrbanist.java b/common/buildcraft/builders/urbanism/GuiUrbanist.java index f3cbde8c..7b2d0a19 100755 --- a/common/buildcraft/builders/urbanism/GuiUrbanist.java +++ b/common/buildcraft/builders/urbanism/GuiUrbanist.java @@ -24,7 +24,7 @@ import buildcraft.core.lib.gui.GuiAdvancedInterface; public class GuiUrbanist extends GuiAdvancedInterface { - private static final ResourceLocation TOOLBAR_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/urbanist_tools.png"); + private static final ResourceLocation TOOLBAR_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/urbanist_tools.png"); private static final int TOOLBAR_TEXTURE_WIDTH = 194; private static final int TOOLBAR_TEXTURE_HEIGHT = 27; diff --git a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java index c3e9e850..9e687ab2 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java @@ -16,7 +16,7 @@ import buildcraft.core.DefaultProps; class UrbanistToolBlock extends UrbanistTool { - private static final ResourceLocation GUI_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/urbanist_tool_place_block.png"); + private static final ResourceLocation GUI_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/urbanist_tool_place_block.png"); private static final int GUI_TEXTURE_WIDTH = 64; private static final int GUI_TEXTURE_HEIGHT = 210; diff --git a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java index a62e79d0..58ce8e83 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java @@ -28,7 +28,7 @@ import buildcraft.core.lib.gui.GuiAdvancedInterface; class UrbanistToolFiller extends UrbanistToolArea { - private static final ResourceLocation GUI_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/urbanist_tool_filler.png"); + private static final ResourceLocation GUI_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/urbanist_tool_filler.png"); private static final int GUI_TEXTURE_WIDTH = 64; private static final int GUI_TEXTURE_HEIGHT = 210; diff --git a/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java b/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java index c25fab96..4af25fb8 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java @@ -42,11 +42,11 @@ public final class UrbanistToolsIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - icons[UrbanistToolsIconProvider.Tool_Block_Place] = iconRegister.registerIcon("buildcraft:icons/urbanist_block"); - icons[UrbanistToolsIconProvider.Tool_Block_Erase] = iconRegister.registerIcon("buildcraft:icons/urbanist_erase"); - icons[UrbanistToolsIconProvider.Tool_Area] = iconRegister.registerIcon("buildcraft:icons/urbanist_area"); - icons[UrbanistToolsIconProvider.Tool_Path] = iconRegister.registerIcon("buildcraft:icons/urbanist_path"); - icons[UrbanistToolsIconProvider.Tool_Filler] = iconRegister.registerIcon("buildcraft:icons/urbanist_filler"); - icons[UrbanistToolsIconProvider.Tool_Blueprint] = iconRegister.registerIcon("buildcraft:icons/urbanist_blueprint"); + icons[UrbanistToolsIconProvider.Tool_Block_Place] = iconRegister.registerIcon("buildcraftbuilders:icons/urbanist_block"); + icons[UrbanistToolsIconProvider.Tool_Block_Erase] = iconRegister.registerIcon("buildcraftbuilders:icons/urbanist_erase"); + icons[UrbanistToolsIconProvider.Tool_Area] = iconRegister.registerIcon("buildcraftbuilders:icons/urbanist_area"); + icons[UrbanistToolsIconProvider.Tool_Path] = iconRegister.registerIcon("buildcraftbuilders:icons/urbanist_path"); + icons[UrbanistToolsIconProvider.Tool_Filler] = iconRegister.registerIcon("buildcraftbuilders:icons/urbanist_filler"); + icons[UrbanistToolsIconProvider.Tool_Blueprint] = iconRegister.registerIcon("buildcraftbuilders:icons/urbanist_blueprint"); } } diff --git a/common/buildcraft/core/CoreGuiHandler.java b/common/buildcraft/core/CoreGuiHandler.java index 48104c97..e1f622d9 100755 --- a/common/buildcraft/core/CoreGuiHandler.java +++ b/common/buildcraft/core/CoreGuiHandler.java @@ -13,8 +13,8 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; -import buildcraft.core.lib.gui.ContainerList; -import buildcraft.core.lib.gui.GuiList; +import buildcraft.core.gui.ContainerList; +import buildcraft.core.gui.GuiList; public class CoreGuiHandler implements IGuiHandler { diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index eecf4c9a..62b79fab 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -35,7 +35,7 @@ public class CoreIconProvider implements IIconProvider { public void registerIcons(IIconRegister iconRegister) { icons = new IIcon[MAX]; - icons[ENERGY] = iconRegister.registerIcon("buildcraft:icons/energy"); + icons[ENERGY] = iconRegister.registerIcon("buildcraftcore:icons/energy"); } diff --git a/common/buildcraft/core/DefaultProps.java b/common/buildcraft/core/DefaultProps.java index 08e75418..21abfa41 100644 --- a/common/buildcraft/core/DefaultProps.java +++ b/common/buildcraft/core/DefaultProps.java @@ -22,9 +22,7 @@ public final class DefaultProps { public static int MARKER_RANGE = 64; public static int PIPE_CONTENTS_RENDER_DIST = 24; - 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 String TEXTURE_PATH_ROBOTS = "buildcraftrobotics:textures/entities"; public static final String DEFAULT_LANGUAGE = "en_US"; diff --git a/common/buildcraft/core/EntityLaser.java b/common/buildcraft/core/EntityLaser.java index 27911d72..bea00869 100644 --- a/common/buildcraft/core/EntityLaser.java +++ b/common/buildcraft/core/EntityLaser.java @@ -18,12 +18,12 @@ import buildcraft.api.core.Position; public abstract class EntityLaser extends Entity { public static final ResourceLocation[] LASER_TEXTURES = new ResourceLocation[]{ - new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_1.png"), - new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_2.png"), - new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_3.png"), - new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png"), - new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png"), - new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/blue_stripes.png")}; + new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_1.png"), + new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_2.png"), + new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_3.png"), + new ResourceLocation("buildcraftcore", "textures/laserBeams/laser_4.png"), + new ResourceLocation("buildcraftcore", "textures/laserBeams/stripes.png"), + new ResourceLocation("buildcraftcore", "textures/laserBeams/blue_stripes.png")}; public LaserData data = new LaserData(); diff --git a/common/buildcraft/core/ItemList.java b/common/buildcraft/core/ItemList.java index 0d791871..567e1409 100644 --- a/common/buildcraft/core/ItemList.java +++ b/common/buildcraft/core/ItemList.java @@ -36,10 +36,6 @@ import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.lib.utils.NBTUtils; public class ItemList extends ItemBuildCraft implements IList { - - private IIcon baseIcon; - private IIcon writtenIcon; - public static class StackLine { public boolean oreWildcard = false; public boolean subitemsWildcard = false; @@ -222,20 +218,12 @@ public class ItemList extends ItemBuildCraft implements IList { @Override public IIcon getIconIndex(ItemStack stack) { - if (NBTUtils.getItemData(stack).hasKey("written")) { - itemIcon = writtenIcon; - } else { - itemIcon = baseIcon; - } - - return itemIcon; + return icons[NBTUtils.getItemData(stack).hasKey("written") ? 1 : 0]; } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - baseIcon = par1IconRegister.registerIcon("buildcraft:list"); - writtenIcon = par1IconRegister.registerIcon("buildcraft:list_used"); + public String[] getIconNames() { + return new String[]{ "list/clean", "list/used" }; } @Override diff --git a/common/buildcraft/core/ItemMapLocation.java b/common/buildcraft/core/ItemMapLocation.java index 86fdbefe..99c4017b 100755 --- a/common/buildcraft/core/ItemMapLocation.java +++ b/common/buildcraft/core/ItemMapLocation.java @@ -38,13 +38,6 @@ import buildcraft.core.lib.utils.NBTUtils; import buildcraft.core.lib.utils.StringUtils; public class ItemMapLocation extends ItemBuildCraft implements IMapLocation { - - public IIcon clean; - public IIcon spot; - public IIcon area; - public IIcon path; - public IIcon zone; - public ItemMapLocation() { super(BCCreativeTab.get("main")); } @@ -107,36 +100,23 @@ public class ItemMapLocation extends ItemBuildCraft implements IMapLocation { NBTTagCompound cpt = NBTUtils.getItemData(stack); if (!cpt.hasKey("kind")) { - itemIcon = clean; + return icons[0]; } else { - switch (cpt.getByte("kind")) { - case 0: - itemIcon = spot; - break; - case 1: - itemIcon = area; - break; - case 2: - itemIcon = path; - break; - case 3: - itemIcon = zone; - break; - } + return getIconFromDamage(cpt.getByte("kind") + 1); } - - return itemIcon; } + @Override + public String[] getIconNames() { + return new String[]{ "mapLocation/clean", "mapLocation/spot", "mapLocation/area", "mapLocation/path", "mapLocation/zone" }; + } + + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - clean = par1IconRegister.registerIcon("buildcraft:map_clean"); - spot = par1IconRegister.registerIcon("buildcraft:map_spot"); - area = par1IconRegister.registerIcon("buildcraft:map_area"); - path = par1IconRegister.registerIcon("buildcraft:map_path"); - zone = par1IconRegister.registerIcon("buildcraft:map_zone"); - + super.registerIcons(par1IconRegister); + // TODO: Move this RedstoneBoardRegistry.instance.registerIcons(par1IconRegister); } diff --git a/common/buildcraft/core/TileEngine.java b/common/buildcraft/core/TileEngine.java index be0cf387..524c7ebd 100644 --- a/common/buildcraft/core/TileEngine.java +++ b/common/buildcraft/core/TileEngine.java @@ -7,26 +7,4 @@ import buildcraft.core.lib.engines.TileEngineBase; * Created by asie on 3/6/15. */ public abstract class TileEngine extends TileEngineBase { - // Index corresponds to metadata - public static final ResourceLocation[] BASE_TEXTURES = new ResourceLocation[]{ - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_wood.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_stone.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_iron.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_creative.png") - }; - - public static final ResourceLocation[] CHAMBER_TEXTURES = new ResourceLocation[]{ - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_wood.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_stone.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_iron.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_creative.png") - }; - - // THESE ARE ONLY BLUE TRUNKS. OTHER HEAT STAGES ARE HANDLED PER TILE - public static final ResourceLocation[] TRUNK_TEXTURES = new ResourceLocation[]{ - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_creative.png") - }; } diff --git a/common/buildcraft/core/TileEngineWood.java b/common/buildcraft/core/TileEngineWood.java index cd189cac..25161bc9 100644 --- a/common/buildcraft/core/TileEngineWood.java +++ b/common/buildcraft/core/TileEngineWood.java @@ -21,15 +21,10 @@ import buildcraft.core.lib.engines.TileEngineBase; public class TileEngineWood extends TileEngine implements IRedstoneEngine { private boolean hasSent = false; - - @Override - public ResourceLocation getBaseTexture() { - return BASE_TEXTURES[0]; - } @Override - public ResourceLocation getChamberTexture() { - return CHAMBER_TEXTURES[0]; + public String getResourcePrefix() { + return "buildcraftcore:textures/blocks/engineWood"; } @Override diff --git a/common/buildcraft/core/builders/patterns/FillerPattern.java b/common/buildcraft/core/builders/patterns/FillerPattern.java index 74d8f50d..01cc5de7 100644 --- a/common/buildcraft/core/builders/patterns/FillerPattern.java +++ b/common/buildcraft/core/builders/patterns/FillerPattern.java @@ -61,7 +61,7 @@ public abstract class FillerPattern implements IFillerPattern { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:fillerPatterns/" + tag); + icon = iconRegister.registerIcon("buildcraftcore:fillerPatterns/" + tag); } @Override diff --git a/common/buildcraft/core/builders/patterns/PatternParameterYDir.java b/common/buildcraft/core/builders/patterns/PatternParameterYDir.java index c5101097..7b305964 100644 --- a/common/buildcraft/core/builders/patterns/PatternParameterYDir.java +++ b/common/buildcraft/core/builders/patterns/PatternParameterYDir.java @@ -41,8 +41,8 @@ public class PatternParameterYDir implements IStatementParameter { @Override public void registerIcons(IIconRegister iconRegister) { - iconUp = iconRegister.registerIcon("buildcraft:fillerParameters/arrow_up"); - iconDown = iconRegister.registerIcon("buildcraft:fillerParameters/arrow_down"); + iconUp = iconRegister.registerIcon("buildcraftcore:fillerParameters/arrow_up"); + iconDown = iconRegister.registerIcon("buildcraftcore:fillerParameters/arrow_down"); } @Override diff --git a/common/buildcraft/core/lib/gui/ContainerList.java b/common/buildcraft/core/gui/ContainerList.java similarity index 97% rename from common/buildcraft/core/lib/gui/ContainerList.java rename to common/buildcraft/core/gui/ContainerList.java index 86a3427d..6ff2c95b 100755 --- a/common/buildcraft/core/lib/gui/ContainerList.java +++ b/common/buildcraft/core/gui/ContainerList.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.lib.gui; +package buildcraft.core.gui; import io.netty.buffer.ByteBuf; @@ -18,6 +18,7 @@ import cpw.mods.fml.relauncher.Side; import buildcraft.BuildCraftCore; import buildcraft.core.ItemList; +import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.lib.network.command.CommandWriter; import buildcraft.core.lib.network.command.ICommandReceiver; import buildcraft.core.lib.network.command.PacketCommand; diff --git a/common/buildcraft/core/lib/gui/GuiList.java b/common/buildcraft/core/gui/GuiList.java similarity index 97% rename from common/buildcraft/core/lib/gui/GuiList.java rename to common/buildcraft/core/gui/GuiList.java index 0e1d4627..06ffe546 100755 --- a/common/buildcraft/core/lib/gui/GuiList.java +++ b/common/buildcraft/core/gui/GuiList.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.lib.gui; +package buildcraft.core.gui; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; @@ -16,11 +16,13 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.core.DefaultProps; import buildcraft.core.ItemList; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; public class GuiList extends GuiAdvancedInterface { private static final ResourceLocation TEXTURE_BASE = new ResourceLocation( - "buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/list.png"); + "buildcraftcore:textures/gui/list.png"); private GuiTextField textField; private EntityPlayer player; diff --git a/common/buildcraft/core/lib/block/BlockBuildCraft.java b/common/buildcraft/core/lib/block/BlockBuildCraft.java index d2fc7f8b..b6668ff8 100644 --- a/common/buildcraft/core/lib/block/BlockBuildCraft.java +++ b/common/buildcraft/core/lib/block/BlockBuildCraft.java @@ -13,26 +13,46 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.events.BlockPlacedDownEvent; import buildcraft.api.tiles.IHasWork; +import buildcraft.api.tools.IToolWrench; import buildcraft.core.BCCreativeTab; +import buildcraft.core.lib.utils.ResourceUtils; import buildcraft.core.lib.utils.Utils; public abstract class BlockBuildCraft extends BlockContainer { + @SideOnly(Side.CLIENT) + public IIcon[][] icons = new IIcon[16][]; protected static boolean keepInventory = false; protected final Random rand = new Random(); + private static final int[][] SIDE_TEXTURING_LOCATIONS = new int[][] { + {2, 3, 5, 4}, + {3, 2, 4, 5}, + {4, 5, 2, 3}, + {5, 4, 3, 2} + }; + private boolean rotatable = false; + protected BlockBuildCraft(Material material) { this(material, BCCreativeTab.get("main")); } @@ -43,17 +63,71 @@ public abstract class BlockBuildCraft extends BlockContainer { setHardness(5F); } + public boolean isRotatable() { + return rotatable; + } + + public void setRotatable(boolean rotatable) { + this.rotatable = rotatable; + } @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, entity, stack); FMLCommonHandler.instance().bus().post(new BlockPlacedDownEvent((EntityPlayer) entity, world.getBlock(x, y, z), world.getBlockMetadata(x, y, z), x, y, z)); TileEntity tile = world.getTileEntity(x, y, z); + + if (isRotatable()) { + ForgeDirection orientation = Utils.get2dOrientation(entity); + world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) & 8 | orientation.getOpposite().ordinal(), 1); + } + if (tile instanceof TileBuildCraft) { ((TileBuildCraft) tile).onBlockPlacedBy(entity, stack); } } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, + float par8, float par9) { + BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); + FMLCommonHandler.instance().bus().post(event); + if (event.isCanceled()) { + return false; + } + + if (isRotatable()) { + if (!entityplayer.isSneaking()) { + Item equipped = entityplayer.getCurrentEquippedItem() != null ? entityplayer.getCurrentEquippedItem().getItem() : null; + if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(entityplayer, x, y, z)) { + int meta = world.getBlockMetadata(x, y, z); + + switch (ForgeDirection.values()[meta & 7]) { + case WEST: + world.setBlockMetadataWithNotify(x, y, z, meta & 8 | ForgeDirection.SOUTH.ordinal(), 0); + break; + case EAST: + world.setBlockMetadataWithNotify(x, y, z, meta & 8 | ForgeDirection.NORTH.ordinal(), 0); + break; + case NORTH: + world.setBlockMetadataWithNotify(x, y, z, meta & 8 | ForgeDirection.WEST.ordinal(), 0); + break; + case SOUTH: + default: + world.setBlockMetadataWithNotify(x, y, z, meta & 8 | ForgeDirection.EAST.ordinal(), 0); + break; + } + + world.markBlockForUpdate(x, y, z); + ((IToolWrench) equipped).wrenchUsed(entityplayer, x, y, z); + return true; + } + } + } + + return false; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6) { Utils.preDestroyBlock(world, x, y, z); @@ -69,4 +143,108 @@ public abstract class BlockBuildCraft extends BlockContainer { return super.getLightValue(world, x, y, z); } } + + + @Override + public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { + // TODO: Actually look at the axis parameter + int meta = world.getBlockMetadata(x, y, z); + + switch (ForgeDirection.getOrientation(meta)) { + case WEST: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.SOUTH.ordinal(), 3); + break; + case EAST: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.NORTH.ordinal(), 3); + break; + case NORTH: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.WEST.ordinal(), 3); + break; + case SOUTH: + default: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.EAST.ordinal(), 3); + break; + } + world.markBlockForUpdate(x, y, z); + return true; + } + + @SideOnly(Side.CLIENT) + public IIcon getIconAbsolute(IBlockAccess access, int x, int y, int z, int side, int metadata) { + return getIconAbsolute(side, metadata); + } + + @SideOnly(Side.CLIENT) + public IIcon getIconAbsolute(int side, int metadata) { + return icons[metadata] == null ? icons[0][side] : icons[metadata][side]; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) { + int metadata = access.getBlockMetadata(x, y, z); + if (isRotatable()) { + if (side < 2) { + return getIconAbsolute(access, x, y, z, side, metadata & 8); + } + + int front = metadata >= 2 && metadata <= 5 ? metadata : 2; + return getIconAbsolute(access, x, y, z, SIDE_TEXTURING_LOCATIONS[(front - 2) % 4][(side - 2) % 4], metadata & 8); + } else { + return getIconAbsolute(access, x, y, z, side, metadata); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + if (isRotatable()) { + if (side < 2) { + return getIconAbsolute(side, metadata & 8); + } + + int front = metadata >= 2 && metadata <= 5 ? metadata : 2; + return getIconAbsolute(SIDE_TEXTURING_LOCATIONS[(front - 2) % 4][(side - 2) % 4], metadata & 8); + } else { + return getIconAbsolute(side, metadata); + } + } + + @SideOnly(Side.CLIENT) + protected void registerIconsForMeta(int meta, String blockName, IIconRegister register) { + icons[meta] = new IIcon[6]; + String name = ResourceUtils.getObjectPrefix(blockName); + icons[meta][0] = ResourceUtils.getIconPriority(register, name, new String[] { + "bottom", "topbottom", "default" + }); + icons[meta][1] = ResourceUtils.getIconPriority(register, name, new String[] { + "top", "topbottom", "default" + }); + icons[meta][2] = ResourceUtils.getIconPriority(register, name, new String[] { + "front", "frontback", "side", "default" + }); + icons[meta][3] = ResourceUtils.getIconPriority(register, name, new String[] { + "back", "frontback", "side", "default" + }); + icons[meta][4] = ResourceUtils.getIconPriority(register, name, new String[] { + "left", "leftright", "side", "default" + }); + icons[meta][5] = ResourceUtils.getIconPriority(register, name, new String[] { + "right", "leftright", "side", "default" + }); + } + + @SideOnly(Side.CLIENT) + public String[] getIconBlockNames() { + return new String[] {Block.blockRegistry.getNameForObject(this)}; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + String[] iconBlockNames = getIconBlockNames(); + for (int i = 0; i < iconBlockNames.length; i++) { + registerIconsForMeta(i, iconBlockNames[i], register); + } + } } diff --git a/common/buildcraft/energy/BlockBuildcraftFluid.java b/common/buildcraft/core/lib/block/BlockBuildCraftFluid.java similarity index 83% rename from common/buildcraft/energy/BlockBuildcraftFluid.java rename to common/buildcraft/core/lib/block/BlockBuildCraftFluid.java index 6deea478..6987bc0f 100644 --- a/common/buildcraft/energy/BlockBuildcraftFluid.java +++ b/common/buildcraft/core/lib/block/BlockBuildCraftFluid.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy; +package buildcraft.core.lib.block; import java.util.Random; @@ -28,9 +28,10 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; -import buildcraft.energy.render.EntityDropParticleFX; +import buildcraft.core.lib.render.EntityDropParticleFX; +import buildcraft.core.lib.utils.ResourceUtils; -public class BlockBuildcraftFluid extends BlockFluidClassic { +public class BlockBuildCraftFluid extends BlockFluidClassic { protected float particleRed; protected float particleGreen; @@ -42,7 +43,7 @@ public class BlockBuildcraftFluid extends BlockFluidClassic { protected int flammability = 0; private MapColor mapColor; - public BlockBuildcraftFluid(Fluid fluid, Material material, MapColor iMapColor) { + public BlockBuildCraftFluid(Fluid fluid, Material material, MapColor iMapColor) { super(fluid, material); mapColor = iMapColor; @@ -56,8 +57,10 @@ public class BlockBuildcraftFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.theIcon = new IIcon[] {iconRegister.registerIcon("buildcraft:" + fluidName + "_still"), - iconRegister.registerIcon("buildcraft:" + fluidName + "_flow")}; + String prefix = ResourceUtils.getObjectPrefix(Block.blockRegistry.getNameForObject(this)); + prefix = prefix.substring(0, prefix.indexOf(":") + 1) + "fluids/"; + this.theIcon = new IIcon[] {iconRegister.registerIcon(prefix + fluidName + "_still"), + iconRegister.registerIcon(prefix + fluidName + "_flow")}; } @Override @@ -86,17 +89,17 @@ public class BlockBuildcraftFluid extends BlockFluidClassic { entity.motionZ = Math.max(-0.05, Math.min(0.05, entity.motionZ * 0.05)); } - public BlockBuildcraftFluid setDense(boolean dense) { + public BlockBuildCraftFluid setDense(boolean dense) { this.dense = dense; return this; } - public BlockBuildcraftFluid setFlammable(boolean flammable) { + public BlockBuildCraftFluid setFlammable(boolean flammable) { this.flammable = flammable; return this; } - public BlockBuildcraftFluid setFlammability(int flammability) { + public BlockBuildCraftFluid setFlammability(int flammability) { this.flammability = flammability; return this; } @@ -121,7 +124,7 @@ public class BlockBuildcraftFluid extends BlockFluidClassic { return flammable && flammability == 0; } - public BlockBuildcraftFluid setParticleColor(float particleRed, float particleGreen, float particleBlue) { + public BlockBuildCraftFluid setParticleColor(float particleRed, float particleGreen, float particleBlue) { this.particleRed = particleRed; this.particleGreen = particleGreen; this.particleBlue = particleBlue; diff --git a/common/buildcraft/core/lib/engines/RenderEngine.java b/common/buildcraft/core/lib/engines/RenderEngine.java index cb742a7e..b4373070 100644 --- a/common/buildcraft/core/lib/engines/RenderEngine.java +++ b/common/buildcraft/core/lib/engines/RenderEngine.java @@ -82,6 +82,10 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor field_147501_a = TileEntityRendererDispatcher.instance; } + public RenderEngine(TileEngineBase engine) { + this(engine.getBaseTexture(), engine.getChamberTexture(), engine.getTrunkTexture(TileEngineBase.EnergyStage.BLUE)); + } + @Override public void inventoryRender(double x, double y, double z, float f, float f1) { render(0.25F, ForgeDirection.UP, baseTexture, chamberTexture, trunkTexture, x, y, z); @@ -89,7 +93,6 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor @Override public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - TileEngineBase engine = (TileEngineBase) tileentity; if (engine != null) { diff --git a/common/buildcraft/core/lib/engines/TileEngineBase.java b/common/buildcraft/core/lib/engines/TileEngineBase.java index 9448236c..bd6ee68e 100644 --- a/common/buildcraft/core/lib/engines/TileEngineBase.java +++ b/common/buildcraft/core/lib/engines/TileEngineBase.java @@ -32,15 +32,16 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.core.DefaultProps; import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.lib.utils.MathUtils; +import buildcraft.core.lib.utils.ResourceUtils; import buildcraft.core.lib.utils.Utils; public abstract class TileEngineBase extends TileBuildCraft implements IPipeConnection, IEnergyHandler, IEngine, IHeatable { // TEMP - public static final ResourceLocation TRUNK_BLUE_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"); - public static final ResourceLocation TRUNK_GREEN_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_green.png"); - public static final ResourceLocation TRUNK_YELLOW_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_yellow.png"); - public static final ResourceLocation TRUNK_RED_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_red.png"); - public static final ResourceLocation TRUNK_OVERHEAT_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_overheat.png"); + public static final ResourceLocation TRUNK_BLUE_TEXTURE = new ResourceLocation("buildcraftcore:textures/blocks/engine/trunk_blue.png"); + public static final ResourceLocation TRUNK_GREEN_TEXTURE = new ResourceLocation("buildcraftcore:textures/blocks/engine/trunk_green.png"); + public static final ResourceLocation TRUNK_YELLOW_TEXTURE = new ResourceLocation("buildcraftcore:textures/blocks/engine/trunk_yellow.png"); + public static final ResourceLocation TRUNK_RED_TEXTURE = new ResourceLocation("buildcraftcore:textures/blocks/engine/trunk_red.png"); + public static final ResourceLocation TRUNK_OVERHEAT_TEXTURE = new ResourceLocation("buildcraftcore:textures/blocks/engine/trunk_overheat.png"); public enum EnergyStage { BLUE, GREEN, YELLOW, RED, OVERHEAT; @@ -74,11 +75,21 @@ public abstract class TileEngineBase extends TileBuildCraft implements IPipeConn } } - public abstract ResourceLocation getBaseTexture(); + public abstract String getResourcePrefix(); - public abstract ResourceLocation getChamberTexture(); + public ResourceLocation getBaseTexture() { + return new ResourceLocation(getResourcePrefix() + "/base.png"); + } + + public ResourceLocation getChamberTexture() { + return new ResourceLocation(getResourcePrefix() + "/chamber.png"); + } public ResourceLocation getTrunkTexture(EnergyStage stage) { + if (ResourceUtils.resourceExists(getResourcePrefix() + "/trunk.png")) { + return new ResourceLocation(getResourcePrefix() + "/trunk.png"); + } + switch (stage) { case BLUE: return TRUNK_BLUE_TEXTURE; diff --git a/common/buildcraft/energy/TileEngineWithInventory.java b/common/buildcraft/core/lib/engines/TileEngineWithInventory.java similarity index 98% rename from common/buildcraft/energy/TileEngineWithInventory.java rename to common/buildcraft/core/lib/engines/TileEngineWithInventory.java index 595bb813..a822d64a 100644 --- a/common/buildcraft/energy/TileEngineWithInventory.java +++ b/common/buildcraft/core/lib/engines/TileEngineWithInventory.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy; +package buildcraft.core.lib.engines; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/lib/gui/AdvancedSlot.java b/common/buildcraft/core/lib/gui/AdvancedSlot.java index 513a2af1..3110919b 100755 --- a/common/buildcraft/core/lib/gui/AdvancedSlot.java +++ b/common/buildcraft/core/lib/gui/AdvancedSlot.java @@ -22,7 +22,7 @@ import buildcraft.core.DefaultProps; public abstract class AdvancedSlot { private static final ResourceLocation TEXTURE_SLOT = new ResourceLocation( - "buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/slot.png"); + "buildcraftcore:textures/gui/slot.png"); public int x, y; public GuiAdvancedInterface gui; diff --git a/common/buildcraft/core/lib/gui/GuiBuildCraft.java b/common/buildcraft/core/lib/gui/GuiBuildCraft.java index e24db210..a81ba6da 100644 --- a/common/buildcraft/core/lib/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/lib/gui/GuiBuildCraft.java @@ -40,7 +40,7 @@ import buildcraft.core.lib.utils.SessionVars; public abstract class GuiBuildCraft extends GuiContainer { - public static final ResourceLocation LEDGER_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/ledger.png"); + public static final ResourceLocation LEDGER_TEXTURE = new ResourceLocation("buildcraftcore:textures/gui/ledger.png"); public final LedgerManager ledgerManager = new LedgerManager(this); public final TileEntity tile; public final BuildCraftContainer container; diff --git a/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java b/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java index c3d599df..ae957d42 100644 --- a/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java @@ -25,7 +25,7 @@ import buildcraft.core.lib.gui.tooltips.ToolTip; @SideOnly(Side.CLIENT) public class GuiBetterButton extends GuiButton implements IToolTipProvider { - public static final ResourceLocation BUTTON_TEXTURES = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/buttons.png"); + public static final ResourceLocation BUTTON_TEXTURES = new ResourceLocation("buildcraftcore:textures/gui/buttons.png"); protected final IButtonTextureSet texture; private ToolTip toolTip; diff --git a/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java b/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java index 23cc406a..c025b977 100644 --- a/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java @@ -48,7 +48,7 @@ public class GuiImageButton extends GuiButton implements IButtonClickEventTrigge } } - public static final ResourceLocation ICON_BUTTON_TEXTURES = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/icon_button.png"); + public static final ResourceLocation ICON_BUTTON_TEXTURES = new ResourceLocation("buildcraftcore:textures/gui/icon_button.png"); public static final int SIZE = 18; diff --git a/common/buildcraft/core/lib/items/ItemBuildCraft.java b/common/buildcraft/core/lib/items/ItemBuildCraft.java index e890bc9c..3a4a1b70 100644 --- a/common/buildcraft/core/lib/items/ItemBuildCraft.java +++ b/common/buildcraft/core/lib/items/ItemBuildCraft.java @@ -12,14 +12,16 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.core.BCCreativeTab; +import buildcraft.core.lib.utils.ResourceUtils; public class ItemBuildCraft extends Item { - + public IIcon[] icons; private String iconName; private boolean passSneakClick = false; @@ -39,10 +41,30 @@ public class ItemBuildCraft extends Item { return super.setUnlocalizedName(par1Str); } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + if (itemIcon != null) { // NBT lookup workaround? + return itemIcon; + } + return icons[meta % icons.length]; + } + + public String[] getIconNames() { + return new String[]{ iconName }; + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("buildcraft:" + iconName); + String[] names = getIconNames(); + String prefix = ResourceUtils.getObjectPrefix(Item.itemRegistry.getNameForObject(this)); + prefix = prefix.substring(0, prefix.indexOf(":") + 1); + icons = new IIcon[names.length]; + + for (int i = 0; i < names.length; i++) { + icons[i] = par1IconRegister.registerIcon(prefix + names[i]); + } } public Item setPassSneakClick(boolean passClick) { diff --git a/common/buildcraft/energy/render/EntityDropParticleFX.java b/common/buildcraft/core/lib/render/EntityDropParticleFX.java similarity index 98% rename from common/buildcraft/energy/render/EntityDropParticleFX.java rename to common/buildcraft/core/lib/render/EntityDropParticleFX.java index a0e89645..8377c5ca 100644 --- a/common/buildcraft/energy/render/EntityDropParticleFX.java +++ b/common/buildcraft/core/lib/render/EntityDropParticleFX.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy.render; +package buildcraft.core.lib.render; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/common/buildcraft/factory/render/ModelFrustum.java b/common/buildcraft/core/lib/render/ModelFrustum.java similarity index 99% rename from common/buildcraft/factory/render/ModelFrustum.java rename to common/buildcraft/core/lib/render/ModelFrustum.java index 185eba1e..a7cbd748 100644 --- a/common/buildcraft/factory/render/ModelFrustum.java +++ b/common/buildcraft/core/lib/render/ModelFrustum.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.factory.render; +package buildcraft.core.lib.render; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.PositionTextureVertex; diff --git a/common/buildcraft/core/lib/utils/ResourceUtils.java b/common/buildcraft/core/lib/utils/ResourceUtils.java new file mode 100644 index 00000000..544544d8 --- /dev/null +++ b/common/buildcraft/core/lib/utils/ResourceUtils.java @@ -0,0 +1,60 @@ +package buildcraft.core.lib.utils; + +import java.io.IOException; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.IResource; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + +public class ResourceUtils { + private ResourceUtils() { + + } + + public static IIcon getIconPriority(IIconRegister register, String prefix, String[] suffixes) { + for (int i = 0; i < suffixes.length; i++) { + String suffix = suffixes[i]; + String path = prefix + "/" + suffix; + if (i == suffixes.length - 1 || resourceExists(iconToResourcePath(register, path))) { + return register.registerIcon(path); + } + } + return null; + } + + public static IIcon getIcon(IIconRegister register, String prefix, String suffix) { + return register.registerIcon(prefix + "/" + suffix); + } + + public static String iconToResourcePath(IIconRegister register, String name) { + int splitLocation = name.indexOf(":"); + + if (register instanceof TextureMap) { + String dir = ((TextureMap) register).getTextureType() == 1 ? "items" : "blocks"; + return name.substring(0, splitLocation) + ":textures/" + dir + "/" + name.substring(splitLocation + 1) + ".png"; + } else { + // ??? + return name; + } + } + /** + * Turns a block/item name into a prefix for finding textures. + * @param objectName + * @return + */ + public static String getObjectPrefix(String objectName) { + int splitLocation = objectName.indexOf(":"); + return objectName.substring(0, splitLocation).replaceAll("[^a-zA-Z0-9\\s]", "") + objectName.substring(splitLocation); + } + + public static boolean resourceExists(String name) { + try { + IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation(name)); + return resource != null; + } catch (IOException e) { + return false; + } + } +} diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 953d94c9..3dc21952 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -92,7 +92,7 @@ public class CoreProxyClient extends CoreProxy { //TODO Update me to grab differing trunk textures ClientRegistry.bindTileEntitySpecialRenderer(TileEngineBase.class, new RenderEngine()); for (int i = 0; i < BuildCraftCore.engineBlock.getEngineCount(); i++) { - RenderingEntityBlocks.blockByEntityRenders.put(new RenderingEntityBlocks.EntityRenderIndex(BuildCraftCore.engineBlock, i), new RenderEngine(TileEngine.BASE_TEXTURES[i], TileEngine.CHAMBER_TEXTURES[i], TileEngine.TRUNK_TEXTURES[i])); + RenderingEntityBlocks.blockByEntityRenders.put(new RenderingEntityBlocks.EntityRenderIndex(BuildCraftCore.engineBlock, i), new RenderEngine((TileEngineBase) BuildCraftCore.engineBlock.createTileEntity(null, i))); } } diff --git a/common/buildcraft/core/render/RenderBoxProvider.java b/common/buildcraft/core/render/RenderBoxProvider.java index 823d90d9..1f236b27 100755 --- a/common/buildcraft/core/render/RenderBoxProvider.java +++ b/common/buildcraft/core/render/RenderBoxProvider.java @@ -22,13 +22,12 @@ import buildcraft.core.IBoxesProvider; public class RenderBoxProvider extends TileEntitySpecialRenderer { - private static final ResourceLocation LASER_RED = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_1.png"); - private static final ResourceLocation LASER_YELLOW = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_2.png"); - private static final ResourceLocation LASER_GREEN = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_3.png"); - private static final ResourceLocation LASER_BLUE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/laser_4.png"); - private static final ResourceLocation STRIPES = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png"); - private static final ResourceLocation BLUE_STRIPES = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/blue_stripes.png"); + private static final ResourceLocation LASER_RED = new ResourceLocation("buildcraftcore:textures/laserBeams/laser_1.png"); + private static final ResourceLocation LASER_YELLOW = new ResourceLocation("buildcraftcore:textures/laserBeams/laser_2.png"); + private static final ResourceLocation LASER_GREEN = new ResourceLocation("buildcraftcore:textures/laserBeams/laser_3.png"); + private static final ResourceLocation LASER_BLUE = new ResourceLocation("buildcraftcore:textures/laserBeams/laser_4.png"); + private static final ResourceLocation STRIPES = new ResourceLocation("buildcraftcore:textures/laserBeams/stripes.png"); + private static final ResourceLocation BLUE_STRIPES = new ResourceLocation("buildcraftcore:textures/laserBeams/blue_stripes.png"); public RenderBoxProvider() { } diff --git a/common/buildcraft/core/statements/ActionMachineControl.java b/common/buildcraft/core/statements/ActionMachineControl.java index 2a671ead..220a23e9 100644 --- a/common/buildcraft/core/statements/ActionMachineControl.java +++ b/common/buildcraft/core/statements/ActionMachineControl.java @@ -50,6 +50,6 @@ public class ActionMachineControl extends BCStatement implements IActionExternal @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/action_machinecontrol_" + mode.name().toLowerCase()); + icon = register.registerIcon("buildcraftcore:triggers/action_machinecontrol_" + mode.name().toLowerCase()); } } diff --git a/common/buildcraft/core/statements/ActionRedstoneOutput.java b/common/buildcraft/core/statements/ActionRedstoneOutput.java index 0cec118b..49b29b6c 100644 --- a/common/buildcraft/core/statements/ActionRedstoneOutput.java +++ b/common/buildcraft/core/statements/ActionRedstoneOutput.java @@ -74,6 +74,6 @@ public class ActionRedstoneOutput extends BCStatement implements IActionInternal @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/action_redstoneoutput"); + icon = register.registerIcon("buildcraftcore:triggers/action_redstoneoutput"); } } diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index d82c692e..173500b9 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -99,12 +99,12 @@ public class StatementParameterDirection implements IStatementParameter { @Override public void registerIcons(IIconRegister iconRegister) { icons = new IIcon[] { - iconRegister.registerIcon("buildcraft:triggers/trigger_dir_down"), - iconRegister.registerIcon("buildcraft:triggers/trigger_dir_up"), - iconRegister.registerIcon("buildcraft:triggers/trigger_dir_north"), - iconRegister.registerIcon("buildcraft:triggers/trigger_dir_south"), - iconRegister.registerIcon("buildcraft:triggers/trigger_dir_west"), - iconRegister.registerIcon("buildcraft:triggers/trigger_dir_east") + iconRegister.registerIcon("buildcraftcore:triggers/trigger_dir_down"), + iconRegister.registerIcon("buildcraftcore:triggers/trigger_dir_up"), + iconRegister.registerIcon("buildcraftcore:triggers/trigger_dir_north"), + iconRegister.registerIcon("buildcraftcore:triggers/trigger_dir_south"), + iconRegister.registerIcon("buildcraftcore:triggers/trigger_dir_west"), + iconRegister.registerIcon("buildcraftcore:triggers/trigger_dir_east") }; } diff --git a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java index 4020bb1b..da700e5a 100644 --- a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java +++ b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java @@ -65,7 +65,7 @@ public class StatementParameterRedstoneGateSideOnly implements @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/redstone_gate_side_only"); + icon = iconRegister.registerIcon("buildcraftcore:triggers/redstone_gate_side_only"); } @Override diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index 3fa1aa43..42e0611b 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -103,7 +103,7 @@ public class TriggerEnergy extends BCStatement implements ITriggerInternal { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/trigger_machine_energy_" + (high ? "high" : "low")); + icon = iconRegister.registerIcon("buildcraftcore:triggers/trigger_energy_storage_" + (high ? "high" : "low")); } @Override diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index 9b17acb2..070b6c1a 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -112,7 +112,7 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_liquidcontainer_" + state.name().toLowerCase()); + icon = register.registerIcon("buildcraftcore:triggers/trigger_liquidcontainer_" + state.name().toLowerCase()); } @Override diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index 84dd375b..13433f12 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -99,7 +99,7 @@ public class TriggerFluidContainerLevel extends BCStatement implements ITriggerE @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_liquidcontainer_" + type.name().toLowerCase()); + icon = register.registerIcon("buildcraftcore:triggers/trigger_liquidcontainer_" + type.name().toLowerCase()); } @Override diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index a809dd2b..ba9eb05b 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -105,7 +105,7 @@ public class TriggerInventory extends BCStatement implements ITriggerExternal { @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_inventory_" + state.name().toLowerCase()); + icon = register.registerIcon("buildcraftcore:triggers/trigger_inventory_" + state.name().toLowerCase()); } @Override diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index 8fc9b8f1..bf88b844 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -100,7 +100,7 @@ public class TriggerInventoryLevel extends BCStatement implements ITriggerExtern @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_inventory_" + type.name().toLowerCase()); + icon = register.registerIcon("buildcraftcore:triggers/trigger_inventory_" + type.name().toLowerCase()); } @Override diff --git a/common/buildcraft/core/statements/TriggerMachine.java b/common/buildcraft/core/statements/TriggerMachine.java index 7a885b7c..6ce79f07 100644 --- a/common/buildcraft/core/statements/TriggerMachine.java +++ b/common/buildcraft/core/statements/TriggerMachine.java @@ -51,6 +51,6 @@ public class TriggerMachine extends BCStatement implements ITriggerExternal { @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_machine_" + (active ? "active" : "inactive")); + icon = register.registerIcon("buildcraftcore:triggers/trigger_machine_" + (active ? "active" : "inactive")); } } diff --git a/common/buildcraft/core/statements/TriggerRedstoneInput.java b/common/buildcraft/core/statements/TriggerRedstoneInput.java index 617d56d1..b3d9371a 100644 --- a/common/buildcraft/core/statements/TriggerRedstoneInput.java +++ b/common/buildcraft/core/statements/TriggerRedstoneInput.java @@ -65,6 +65,6 @@ public class TriggerRedstoneInput extends BCStatement implements ITriggerInterna @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_redstoneinput_" + (active ? "active" : "inactive")); + icon = register.registerIcon("buildcraftcore:triggers/trigger_redstoneinput_" + (active ? "active" : "inactive")); } } diff --git a/common/buildcraft/energy/EnergyGuiHandler.java b/common/buildcraft/energy/EnergyGuiHandler.java index 4a644467..17efc1bb 100644 --- a/common/buildcraft/energy/EnergyGuiHandler.java +++ b/common/buildcraft/energy/EnergyGuiHandler.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; import buildcraft.core.GuiIds; +import buildcraft.core.lib.engines.TileEngineWithInventory; import buildcraft.energy.gui.ContainerEngine; import buildcraft.energy.gui.GuiCombustionEngine; import buildcraft.energy.gui.GuiStoneEngine; diff --git a/common/buildcraft/energy/ItemBucketBuildcraft.java b/common/buildcraft/energy/ItemBucketBuildcraft.java index e71f9423..5b087211 100644 --- a/common/buildcraft/energy/ItemBucketBuildcraft.java +++ b/common/buildcraft/energy/ItemBucketBuildcraft.java @@ -43,6 +43,6 @@ public class ItemBucketBuildcraft extends ItemBucket { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("buildcraft:" + iconName); + this.itemIcon = par1IconRegister.registerIcon("buildcraftenergy:" + iconName); } } diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index 10da387f..2c707064 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -29,26 +29,16 @@ import buildcraft.core.lib.utils.StringUtils; public class TileEngineCreative extends TileEngine { private PowerMode powerMode = PowerMode.M2; - @Override - public ResourceLocation getBaseTexture() { - return BASE_TEXTURES[3]; - } - - @Override - public ResourceLocation getChamberTexture() { - return CHAMBER_TEXTURES[3]; - } - - @Override - public ResourceLocation getTrunkTexture(EnergyStage stage) { - return TRUNK_TEXTURES[3]; - } - @Override protected EnergyStage computeEnergyStage() { return EnergyStage.BLUE; } + @Override + public String getResourcePrefix() { + return "buildcraftenergy:textures/blocks/engineCreative"; + } + @Override public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) { if (!getWorldObj().isRemote) { diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index f4c4c568..4941ad4d 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -13,7 +13,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; @@ -31,11 +30,11 @@ import buildcraft.api.fuels.IFuel; import buildcraft.api.fuels.ISolidCoolant; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; +import buildcraft.core.lib.engines.TileEngineWithInventory; import buildcraft.core.lib.fluids.Tank; import buildcraft.core.lib.fluids.TankManager; import buildcraft.core.lib.fluids.TankUtils; import buildcraft.core.lib.inventory.InvUtils; -import buildcraft.energy.gui.ContainerEngine; public class TileEngineIron extends TileEngineWithInventory implements IFluidHandler { @@ -62,13 +61,8 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan } @Override - public ResourceLocation getBaseTexture() { - return BASE_TEXTURES[2]; - } - - @Override - public ResourceLocation getChamberTexture() { - return CHAMBER_TEXTURES[2]; + public String getResourcePrefix() { + return "buildcraftenergy:textures/blocks/engineIron"; } @Override diff --git a/common/buildcraft/energy/TileEngineStone.java b/common/buildcraft/energy/TileEngineStone.java index 11201c17..752eb386 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -15,15 +15,14 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftEnergy; import buildcraft.core.GuiIds; +import buildcraft.core.lib.engines.TileEngineWithInventory; import buildcraft.core.lib.inventory.InvUtils; import buildcraft.core.lib.utils.MathUtils; -import buildcraft.energy.gui.ContainerEngine; public class TileEngineStone extends TileEngineWithInventory { @@ -43,13 +42,8 @@ public class TileEngineStone extends TileEngineWithInventory { } @Override - public ResourceLocation getBaseTexture() { - return BASE_TEXTURES[1]; - } - - @Override - public ResourceLocation getChamberTexture() { - return CHAMBER_TEXTURES[1]; + public String getResourcePrefix() { + return "buildcraftenergy:textures/blocks/engineStone"; } @Override diff --git a/common/buildcraft/energy/gui/ContainerEngine.java b/common/buildcraft/energy/gui/ContainerEngine.java index 5dba203a..c938ed27 100644 --- a/common/buildcraft/energy/gui/ContainerEngine.java +++ b/common/buildcraft/energy/gui/ContainerEngine.java @@ -15,7 +15,7 @@ import net.minecraft.inventory.Slot; import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.energy.TileEngineStone; -import buildcraft.energy.TileEngineWithInventory; +import buildcraft.core.lib.engines.TileEngineWithInventory; public class ContainerEngine extends BuildCraftContainer { diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index 465a5726..d958b193 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -17,7 +17,7 @@ import buildcraft.energy.TileEngineIron; public class GuiCombustionEngine extends GuiEngine { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftenergy:textures/gui/combustion_engine_gui.png"); public GuiCombustionEngine(InventoryPlayer inventoryplayer, TileEngineIron tileEngine) { super(new ContainerEngine(inventoryplayer, tileEngine), tileEngine, TEXTURE); diff --git a/common/buildcraft/energy/gui/GuiStoneEngine.java b/common/buildcraft/energy/gui/GuiStoneEngine.java index fcfead6f..0a07ccd0 100644 --- a/common/buildcraft/energy/gui/GuiStoneEngine.java +++ b/common/buildcraft/energy/gui/GuiStoneEngine.java @@ -19,7 +19,7 @@ import buildcraft.energy.TileEngineStone; public class GuiStoneEngine extends GuiEngine { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/steam_engine_gui.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftenergy:textures/gui/steam_engine_gui.png"); public GuiStoneEngine(InventoryPlayer inventoryplayer, TileEngineStone tileEngine) { super(new ContainerEngine(inventoryplayer, tileEngine), tileEngine, TEXTURE); diff --git a/common/buildcraft/energy/statements/TriggerEngineHeat.java b/common/buildcraft/energy/statements/TriggerEngineHeat.java index 78bc8420..6bb9db3e 100644 --- a/common/buildcraft/energy/statements/TriggerEngineHeat.java +++ b/common/buildcraft/energy/statements/TriggerEngineHeat.java @@ -55,6 +55,6 @@ public class TriggerEngineHeat extends BCStatement implements ITriggerExternal { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_" + stage.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcraftenergy:triggers/trigger_engineheat_" + stage.name().toLowerCase(Locale.ENGLISH)); } } diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index 58cfae1a..b05f3d41 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -26,34 +26,17 @@ import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; public class BlockAutoWorkbench extends BlockBuildCraft { - - IIcon topTexture; - IIcon sideTexture; - public BlockAutoWorkbench() { super(Material.wood); setHardness(3.0F); } - @Override - public IIcon getIcon(int i, int j) { - if (i == 1 || i == 0) { - return topTexture; - } else { - return sideTexture; - } - } - @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9); - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; } - // Drop through if the player is sneaking if (entityplayer.isSneaking()) { return false; } @@ -75,11 +58,4 @@ public class BlockAutoWorkbench extends BlockBuildCraft { public TileEntity createNewTileEntity(World world, int metadata) { return new TileAutoWorkbench(); } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - topTexture = par1IconRegister.registerIcon("buildcraft:autoWorkbench_top"); - sideTexture = par1IconRegister.registerIcon("buildcraft:autoWorkbench_side"); - } } diff --git a/common/buildcraft/factory/BlockFloodGate.java b/common/buildcraft/factory/BlockFloodGate.java index 946fdfb3..8ad3a686 100644 --- a/common/buildcraft/factory/BlockFloodGate.java +++ b/common/buildcraft/factory/BlockFloodGate.java @@ -25,11 +25,6 @@ import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.utils.Utils; public class BlockFloodGate extends BlockBuildCraft { - - private IIcon textureTop; - private IIcon textureBottom; - private IIcon textureSide; - public BlockFloodGate() { super(Material.iron); } @@ -39,26 +34,12 @@ public class BlockFloodGate extends BlockBuildCraft { return new TileFloodGate(); } - @Override - public IIcon getIcon(int i, int j) { - switch (i) { - case 0: - return textureBottom; - case 1: - return textureTop; - default: - return textureSide; - } - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) { - Utils.preDestroyBlock(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } - @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; + } + TileEntity tile = world.getTileEntity(i, j, k); if (tile instanceof TileFloodGate) { @@ -90,12 +71,4 @@ public class BlockFloodGate extends BlockBuildCraft { ((TileFloodGate) tile).onNeighborBlockChange(block); } } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcon("buildcraft:floodgate_top"); - textureBottom = par1IconRegister.registerIcon("buildcraft:floodgate_bottom"); - textureSide = par1IconRegister.registerIcon("buildcraft:floodgate_side"); - } } diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 1bad81e2..9e32e17c 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -211,8 +211,7 @@ public class BlockFrame extends Block implements IFramePipeConnection { } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = par1IconRegister.registerIcon("buildcraft:blockFrame"); + public void registerBlockIcons(IIconRegister register) { + blockIcon = register.registerIcon("buildcraftfactory:frameBlock/default"); } } diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index 635ab814..4cb9a381 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -56,16 +56,11 @@ public class BlockHopper extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9); - - // Drop through if the player is sneaking - if (entityplayer.isSneaking()) { - return false; + if (super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9)) { + return true; } - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { + if (entityplayer.isSneaking()) { return false; } @@ -85,12 +80,12 @@ public class BlockHopper extends BlockBuildCraft { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { - icon = par1IconRegister.registerIcon("buildcraft:hopperBottom"); + icon = par1IconRegister.registerIcon("buildcraftfactory:hopperBlock/bottom"); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { + public IIcon getIconAbsolute(int par1, int par2) { return icon; } } diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index e237b8e8..290fa17c 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -27,41 +27,13 @@ import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.utils.Utils; public class BlockMiningWell extends BlockBuildCraft { - - IIcon textureFront, textureSides, textureBack, textureTop; - public BlockMiningWell() { super(Material.ground); setHardness(5F); setResistance(10F); setStepSound(soundTypeStone); - } - - @Override - public IIcon getIcon(int i, int j) { - if (j == 0 && i == 3) { - return textureFront; - } - - if (i == 1) { - return textureTop; - } else if (i == 0) { - return textureBack; - } else if (i == j) { - return textureFront; - } else if (j >= 0 && j < 6 && ForgeDirection.values()[j].getOpposite().ordinal() == i) { - return textureBack; - } else { - return textureSides; - } - } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - ForgeDirection orientation = Utils.get2dOrientation(entityliving); - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); + setRotatable(true); } @Override @@ -84,13 +56,4 @@ public class BlockMiningWell extends BlockBuildCraft { public TileEntity createNewTileEntity(World world, int metadata) { return new TileMiningWell(); } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - textureFront = par1IconRegister.registerIcon("buildcraft:miningwell_front"); - textureSides = par1IconRegister.registerIcon("buildcraft:miningwell_side"); - textureBack = par1IconRegister.registerIcon("buildcraft:miningwell_back"); - textureTop = par1IconRegister.registerIcon("buildcraft:miningwell_top"); - } } diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index 339d975c..62093936 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -62,10 +62,6 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { return false; } - public float getHeightInPipe() { - return 0.5F; - } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { @@ -82,14 +78,13 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { return new ArrayList(); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon("buildcraft:blockPlainPipe"); - } - @Override public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity) { return true; } + + @Override + public void registerBlockIcons(IIconRegister register) { + blockIcon = register.registerIcon("buildcraftfactory:plainPipeBlock/default"); + } } diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index b3ec8e49..65abbdb7 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -25,11 +25,6 @@ import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.utils.Utils; public class BlockPump extends BlockBuildCraft { - - private IIcon textureTop; - private IIcon textureBottom; - private IIcon textureSide; - public BlockPump() { super(Material.iron); } @@ -39,26 +34,12 @@ public class BlockPump extends BlockBuildCraft { return new TilePump(); } - @Override - public IIcon getIcon(int i, int j) { - switch (i) { - case 0: - return textureBottom; - case 1: - return textureTop; - default: - return textureSide; - } - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) { - Utils.preDestroyBlock(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } - @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; + } + TileEntity tile = world.getTileEntity(i, j, k); if (tile instanceof TilePump) { @@ -91,12 +72,4 @@ public class BlockPump extends BlockBuildCraft { ((TilePump) tile).onNeighborBlockChange(block); } } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcon("buildcraft:pump_top"); - textureBottom = par1IconRegister.registerIcon("buildcraft:pump_bottom"); - textureSide = par1IconRegister.registerIcon("buildcraft:pump_side"); - } } diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 750cc84c..e64619d1 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -33,26 +33,18 @@ import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.lib.utils.Utils; public class BlockQuarry extends BlockBuildCraft { - - IIcon textureTop; - IIcon textureFront; - IIcon textureSide; - public BlockQuarry() { super(Material.iron); setHardness(10F); setResistance(10F); setStepSound(soundTypeAnvil); + setRotatable(true); } @Override public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - - ForgeDirection orientation = Utils.get2dOrientation(entityliving); - - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); if (entityliving instanceof EntityPlayer) { TileEntity tile = world.getTileEntity(i, j, k); if (tile instanceof TileQuarry) { @@ -61,25 +53,6 @@ public class BlockQuarry extends BlockBuildCraft { } } - @Override - public IIcon getIcon(int i, int j) { - // If no metadata is set, then this is an icon. - if (j == 0 && i == 3) { - return textureFront; - } - - if (i == j && i > 1) { - return textureFront; - } - - switch (i) { - case 1: - return textureTop; - default: - return textureSide; - } - } - @Override public TileEntity createNewTileEntity(World world, int metadata) { return new TileQuarry(); @@ -151,6 +124,10 @@ public class BlockQuarry extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; + } + TileQuarry tile = (TileQuarry) world.getTileEntity(i, j, k); // Drop through if the player is sneaking @@ -171,14 +148,6 @@ public class BlockQuarry extends BlockBuildCraft { return false; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - textureSide = par1IconRegister.registerIcon("buildcraft:quarry_side"); - textureTop = par1IconRegister.registerIcon("buildcraft:quarry_top"); - textureFront = par1IconRegister.registerIcon("buildcraft:quarry_front"); - } - @Override public boolean renderAsNormalBlock() { return false; diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index 92ebe7ee..114020a7 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -37,14 +37,12 @@ import buildcraft.core.lib.fluids.TankUtils; import buildcraft.core.lib.utils.Utils; public class BlockRefinery extends BlockBuildCraft { - - private static IIcon icon; - public BlockRefinery() { super(Material.iron); setHardness(5F); setCreativeTab(BCCreativeTab.get("main")); + setRotatable(true); } @Override @@ -57,10 +55,6 @@ public class BlockRefinery extends BlockBuildCraft { return false; } - public boolean isACube() { - return false; - } - @Override public int getRenderType() { return BuildCraftCore.blockByEntityModel; @@ -71,50 +65,17 @@ public class BlockRefinery extends BlockBuildCraft { return new TileRefinery(); } - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - - ForgeDirection orientation = Utils.get2dOrientation(entityliving); - - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); - } - - @Override - public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { - int meta = world.getBlockMetadata(x, y, z); - - switch (ForgeDirection.getOrientation(meta)) { - case WEST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.SOUTH.ordinal(), 3); - break; - case EAST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.NORTH.ordinal(), 3); - break; - case NORTH: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.WEST.ordinal(), 3); - break; - case SOUTH: - default: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.EAST.ordinal(), 3); - break; - } - world.markBlockForUpdate(x, y, z); - return true; - } - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if (super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ)) { + return true; + } + TileEntity tile = world.getTileEntity(x, y, z); if (!(tile instanceof TileRefinery)) { return false; } - BlockInteractionEvent event = new BlockInteractionEvent(player, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } ItemStack current = player.getCurrentEquippedItem(); Item equipped = current != null ? current.getItem() : null; @@ -141,16 +102,4 @@ public class BlockRefinery extends BlockBuildCraft { return true; } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icon = par1IconRegister.registerIcon("buildcraft:refineryBack"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - return icon; - } } diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index d227b164..6e905320 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -33,10 +33,7 @@ import buildcraft.core.BCCreativeTab; import buildcraft.core.lib.inventory.InvUtils; public class BlockTank extends BlockBuildCraft { - private IIcon textureStackedSide; - private IIcon textureBottomSide; - private IIcon textureTop; public BlockTank() { super(Material.glass); @@ -60,44 +57,24 @@ public class BlockTank extends BlockBuildCraft { return new TileTank(); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - switch (par1) { - case 0: - case 1: - return textureTop; - default: - return textureBottomSide; - } - } - @SuppressWarnings({"all"}) @Override - public IIcon getIcon(IBlockAccess iblockaccess, int i, int j, int k, int l) { - switch (l) { - case 0: - case 1: - return textureTop; - default: - if (iblockaccess.getBlock(i, j - 1, k) == this) { - return textureStackedSide; - } else { - return textureBottomSide; - } + public IIcon getIconAbsolute(IBlockAccess iblockaccess, int i, int j, int k, int side, int metadata) { + if (side >= 2 && iblockaccess.getBlock(i, j - 1, k) == this) { + return textureStackedSide; + } else { + return super.getIconAbsolute(side, metadata); } } @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - ItemStack current = entityplayer.inventory.getCurrentItem(); - - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; } + ItemStack current = entityplayer.inventory.getCurrentItem(); + if (current != null) { TileEntity tile = world.getTileEntity(i, j, k); @@ -194,9 +171,8 @@ public class BlockTank extends BlockBuildCraft { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { - textureStackedSide = par1IconRegister.registerIcon("buildcraft:tank_stacked_side"); - textureBottomSide = par1IconRegister.registerIcon("buildcraft:tank_bottom_side"); - textureTop = par1IconRegister.registerIcon("buildcraft:tank_top"); + super.registerBlockIcons(par1IconRegister); + textureStackedSide = par1IconRegister.registerIcon("buildcraftfactory:tankBlock/side_stacked"); } @Override diff --git a/common/buildcraft/factory/gui/GuiAutoCrafting.java b/common/buildcraft/factory/gui/GuiAutoCrafting.java index e92544d6..aea88099 100644 --- a/common/buildcraft/factory/gui/GuiAutoCrafting.java +++ b/common/buildcraft/factory/gui/GuiAutoCrafting.java @@ -21,7 +21,7 @@ import buildcraft.factory.TileAutoWorkbench; public class GuiAutoCrafting extends GuiBuildCraft { - public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/autobench.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftfactory:textures/gui/autobench.png"); private TileAutoWorkbench bench; public GuiAutoCrafting(InventoryPlayer inventoryplayer, World world, TileAutoWorkbench tile) { diff --git a/common/buildcraft/factory/gui/GuiHopper.java b/common/buildcraft/factory/gui/GuiHopper.java index 86f7d3de..1a8b3fd3 100644 --- a/common/buildcraft/factory/gui/GuiHopper.java +++ b/common/buildcraft/factory/gui/GuiHopper.java @@ -19,7 +19,7 @@ import buildcraft.factory.TileHopper; public class GuiHopper extends GuiContainer { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftfactory:textures/gui/hopper_gui.png"); public GuiHopper(InventoryPlayer inventory, TileHopper tile) { super(new ContainerHopper(inventory, tile)); diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 5e944563..5a8fb1ae 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -26,8 +26,8 @@ import buildcraft.factory.TileRefinery; public class GuiRefinery extends GuiAdvancedInterface { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png"); - ContainerRefinery container; + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftfactory:textures/gui/refinery_filter.png"); + private final ContainerRefinery container; public GuiRefinery(InventoryPlayer inventory, TileRefinery refinery) { super(new ContainerRefinery(inventory, refinery), refinery, TEXTURE); diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index dc606dae..64124764 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -22,11 +22,12 @@ import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.core.DefaultProps; import buildcraft.core.lib.render.IInventoryRenderer; +import buildcraft.core.lib.render.ModelFrustum; public class RenderHopper extends TileEntitySpecialRenderer implements IInventoryRenderer { - 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 static final ResourceLocation HOPPER_TEXTURE = new ResourceLocation("buildcraftfactory:textures/blocks/hopperBlock/top.png"); + private static final ResourceLocation HOPPER_MIDDLE_TEXTURE = new ResourceLocation("buildcraftfactory:textures/blocks/hopperBlock/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 5719404e..9368c5ab 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -28,7 +28,7 @@ import buildcraft.factory.TileRefinery; public class RenderRefinery extends TileEntitySpecialRenderer implements IInventoryRenderer { - private static final ResourceLocation TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/refinery.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftfactory:textures/blocks/refineryBlock/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/robotics/BlockRequester.java b/common/buildcraft/robotics/BlockRequester.java index 997b26da..ad1dedaa 100755 --- a/common/buildcraft/robotics/BlockRequester.java +++ b/common/buildcraft/robotics/BlockRequester.java @@ -30,10 +30,6 @@ import buildcraft.core.GuiIds; import buildcraft.core.lib.utils.Utils; public class BlockRequester extends BlockBuildCraft { - - private IIcon blockTextureDefault; - private IIcon blockTextureSide; - public BlockRequester() { super(Material.iron); } @@ -46,11 +42,8 @@ public class BlockRequester extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; } if (!world.isRemote) { @@ -60,30 +53,4 @@ public class BlockRequester extends BlockBuildCraft { return true; } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - - ForgeDirection orientation = Utils.get2dOrientation(entityliving); - - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockTextureDefault = par1IconRegister.registerIcon("buildcraft:commander_side"); - blockTextureSide = par1IconRegister.registerIcon("buildcraft:requester_side"); - } - - @Override - public IIcon getIcon(int i, int j) { - if (i == 0 || i == 1) { - return blockTextureDefault; - } else { - return blockTextureSide; - } - } - } diff --git a/common/buildcraft/robotics/BlockZonePlan.java b/common/buildcraft/robotics/BlockZonePlan.java index 7b02bbf0..4fe33c61 100755 --- a/common/buildcraft/robotics/BlockZonePlan.java +++ b/common/buildcraft/robotics/BlockZonePlan.java @@ -30,10 +30,6 @@ import buildcraft.core.GuiIds; import buildcraft.core.lib.utils.Utils; public class BlockZonePlan extends BlockBuildCraft { - - private IIcon blockTextureSide; - private IIcon blockTextureFront; - public BlockZonePlan() { super(Material.iron); } @@ -46,11 +42,8 @@ public class BlockZonePlan extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; } if (!world.isRemote) { @@ -60,34 +53,4 @@ public class BlockZonePlan extends BlockBuildCraft { return true; } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - - ForgeDirection orientation = Utils.get2dOrientation(entityliving); - - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockTextureSide = par1IconRegister.registerIcon("buildcraft:zonePlan_side"); - blockTextureFront = par1IconRegister.registerIcon("buildcraft:zonePlan_front"); - } - - @Override - public IIcon getIcon(int i, int j) { - if (j == 0 && i == 3) { - return blockTextureFront; - } - - if (i == j) { - return blockTextureFront; - } - - return blockTextureSide; - } - } diff --git a/common/buildcraft/robotics/EntityRobot.java b/common/buildcraft/robotics/EntityRobot.java index 6ff7463f..516c5f08 100644 --- a/common/buildcraft/robotics/EntityRobot.java +++ b/common/buildcraft/robotics/EntityRobot.java @@ -74,18 +74,8 @@ import buildcraft.transport.gates.StatementSlot; public class EntityRobot extends EntityRobotBase implements IEntityAdditionalSpawnData, IInventory, IFluidHandler, ICommandReceiver, IDebuggable { - public static final ResourceLocation ROBOT_BASE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_base.png"); - public static final ResourceLocation ROBOT_BUILDER = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_builder.png"); - public static final ResourceLocation ROBOT_TRANSPORT = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_picker.png"); - public static final ResourceLocation ROBOT_FACTORY = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_factory.png"); - - private static ResourceLocation defaultTexture = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_base.png"); - - public SafeTimeTracker scanForTasks = new SafeTimeTracker (40, 10); + public static final ResourceLocation ROBOT_BASE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_base.png"); public LaserData laser = new LaserData(); public IDockingStation linkedDockingStation; @@ -114,7 +104,6 @@ public class EntityRobot extends EntityRobotBase implements private ItemStack[] inv = new ItemStack[4]; private FluidStack tank; private int maxFluid = FluidContainerRegistry.BUCKET_VOLUME * 4; - private String boardID; private ResourceLocation texture; private WeakHashMap unreachableEntities = new WeakHashMap(); diff --git a/common/buildcraft/robotics/ItemRedstoneBoard.java b/common/buildcraft/robotics/ItemRedstoneBoard.java index 4b1f5cb5..e67bb378 100755 --- a/common/buildcraft/robotics/ItemRedstoneBoard.java +++ b/common/buildcraft/robotics/ItemRedstoneBoard.java @@ -29,10 +29,6 @@ import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.lib.utils.NBTUtils; public class ItemRedstoneBoard extends ItemBuildCraft { - - public IIcon cleanBoard; - public IIcon unknownBoard; - public ItemRedstoneBoard() { super(BCCreativeTab.get("boards")); } @@ -56,9 +52,9 @@ public class ItemRedstoneBoard extends ItemBuildCraft { NBTTagCompound cpt = NBTUtils.getItemData(stack); if (!cpt.hasKey("id")) { - itemIcon = cleanBoard; + itemIcon = icons[0]; } else if ("".equals(cpt.getString("id"))) { - itemIcon = unknownBoard; + itemIcon = icons[1]; } else { itemIcon = RedstoneBoardRegistry.instance.getRedstoneBoard(cpt).getIcon(cpt); } @@ -68,13 +64,11 @@ public class ItemRedstoneBoard extends ItemBuildCraft { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - cleanBoard = par1IconRegister.registerIcon("buildcraft:board_clean"); - unknownBoard = par1IconRegister.registerIcon("buildcraft:board_unknown"); - - RedstoneBoardRegistry.instance.registerIcons(par1IconRegister); + public String[] getIconNames() { + return new String[]{ "board/clean", "board/unknown" }; } + @SuppressWarnings({"unchecked", "rawtypes"}) @Override @SideOnly(Side.CLIENT) diff --git a/common/buildcraft/robotics/RobotStationPluggable.java b/common/buildcraft/robotics/RobotStationPluggable.java index bdfd6ecc..2076f243 100644 --- a/common/buildcraft/robotics/RobotStationPluggable.java +++ b/common/buildcraft/robotics/RobotStationPluggable.java @@ -264,7 +264,7 @@ public class RobotStationPluggable extends PipePluggable implements IPipePluggab @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if (station != null && station.isTaken() && station.robotTaking() != null && station.robotTaking().getBattery() != null + if (station != null && station.robotTaking() != null && station.robotTaking().getBattery() != null && station.robotTaking().getDockingStation() == station) { return station.robotTaking().getBattery().receiveEnergy(maxReceive, simulate); } diff --git a/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java b/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java index faeed17a..3e1dc7f9 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotBomberNBT extends RedstoneBoardRobotNBT { public static BoardRobotBomberNBT instance = new BoardRobotBomberNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_bomber.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_bomber.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotBomberNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_red"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/red"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java b/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java index 7a536ef5..6e8efc53 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotBuilderNBT extends RedstoneBoardRobotNBT { public static BoardRobotBuilderNBT instance = new BoardRobotBuilderNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_builder.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_builder.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotBuilderNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_yellow"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/yellow"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java b/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java index f700bccf..e865c308 100755 --- a/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotButcherNBT extends RedstoneBoardRobotNBT { public static BoardRobotButcherNBT instance = new BoardRobotButcherNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_butcher.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_butcher.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotButcherNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java b/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java index 2b2ff420..2da0078d 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotCarrierNBT extends RedstoneBoardRobotNBT { public static BoardRobotCarrierNBT instance = new BoardRobotCarrierNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_carrier.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_carrier.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotCarrierNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_green"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/green"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java b/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java index df188efe..b9587b97 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotCrafterNBT extends RedstoneBoardRobotNBT { public static BoardRobotCrafterNBT instance = new BoardRobotCrafterNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_crafter.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_crafter.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotCrafterNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java b/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java index efadba49..e4aaa939 100755 --- a/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotDeliveryNBT extends RedstoneBoardRobotNBT { public static BoardRobotDeliveryNBT instance = new BoardRobotDeliveryNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_delivery.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_delivery.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotDeliveryNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_green"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/green"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java b/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java index 75ea9912..dae3466b 100755 --- a/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotFarmerNBT extends RedstoneBoardRobotNBT { public static BoardRobotFarmerNBT instance = new BoardRobotFarmerNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_farmer.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_farmer.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotFarmerNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java b/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java index 223a2ea4..67def54f 100755 --- a/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotFluidCarrierNBT extends RedstoneBoardRobotNBT { public static BoardRobotFluidCarrierNBT instance = new BoardRobotFluidCarrierNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_fluid_carrier.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_fluid_carrier.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotFluidCarrierNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_green"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/green"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java b/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java index 23fba363..ee6b81f4 100755 --- a/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotHarvesterNBT extends RedstoneBoardRobotNBT { public static BoardRobotHarvesterNBT instance = new BoardRobotHarvesterNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_harvester.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_harvester.png"); public IIcon icon; @@ -57,7 +57,7 @@ public final class BoardRobotHarvesterNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java b/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java index 369528a7..502f2624 100755 --- a/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotKnightNBT extends RedstoneBoardRobotNBT { public static BoardRobotKnightNBT instance = new BoardRobotKnightNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_knight.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_knight.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotKnightNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_red"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/red"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java b/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java index 32d888a4..7a172c48 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotLeaveCutterNBT extends RedstoneBoardRobotNBT { public static BoardRobotLeaveCutterNBT instance = new BoardRobotLeaveCutterNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_leave_cutter.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_leave_cutter.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotLeaveCutterNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java b/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java index 4b00e50d..7bddba5c 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotLumberjackNBT extends RedstoneBoardRobotNBT { public static BoardRobotLumberjackNBT instance = new BoardRobotLumberjackNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_lumberjack.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_lumberjack.png"); public IIcon icon; @@ -57,7 +57,7 @@ public final class BoardRobotLumberjackNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java b/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java index e51e0cc9..b40d1fc8 100755 --- a/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotMinerNBT extends RedstoneBoardRobotNBT { public static BoardRobotMinerNBT instance = new BoardRobotMinerNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_miner.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_miner.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotMinerNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java index 77075f77..6d02a039 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java @@ -20,13 +20,16 @@ import net.minecraft.util.ResourceLocation; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.DefaultProps; import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.EntityRobot; public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT { - public static BoardRobotPickerNBT instance = new BoardRobotPickerNBT(); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_picker.png"); + public IIcon icon; private BoardRobotPickerNBT() { @@ -54,11 +57,11 @@ public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_green"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/green"); } @Override public ResourceLocation getRobotTexture() { - return EntityRobot.ROBOT_TRANSPORT; + return TEXTURE; } } diff --git a/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java b/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java index d102c3da..6043ceca 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotPlanterNBT extends RedstoneBoardRobotNBT { public static BoardRobotPlanterNBT instance = new BoardRobotPlanterNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_planter.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_planter.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotPlanterNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java b/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java index 57e38419..453ce574 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotPumpNBT extends RedstoneBoardRobotNBT { public static BoardRobotPumpNBT instance = new BoardRobotPumpNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_pump.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_pump.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotPumpNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java b/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java index 35bcc205..fa65c482 100755 --- a/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotShovelmanNBT extends RedstoneBoardRobotNBT { public static BoardRobotShovelmanNBT instance = new BoardRobotShovelmanNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_shovelman.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_shovelman.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotShovelmanNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_blue"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/blue"); } @Override diff --git a/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java b/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java index 368f64f3..c2c88fbb 100644 --- a/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java @@ -27,8 +27,8 @@ public final class BoardRobotStripesNBT extends RedstoneBoardRobotNBT { public static BoardRobotStripesNBT instance = new BoardRobotStripesNBT(); - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_stripes.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_stripes.png"); private IIcon icon; @@ -54,7 +54,7 @@ public final class BoardRobotStripesNBT extends RedstoneBoardRobotNBT { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:board_yellow"); + icon = iconRegister.registerIcon("buildcraftrobotics:board/yellow"); } @Override diff --git a/common/buildcraft/robotics/gui/GuiRequester.java b/common/buildcraft/robotics/gui/GuiRequester.java index f17d2463..1e74c195 100755 --- a/common/buildcraft/robotics/gui/GuiRequester.java +++ b/common/buildcraft/robotics/gui/GuiRequester.java @@ -19,8 +19,7 @@ import buildcraft.robotics.TileRequester; public class GuiRequester extends GuiAdvancedInterface { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_GUI + "/requester_gui.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftrobotics:textures/gui/requester_gui.png"); private TileRequester requester; diff --git a/common/buildcraft/robotics/gui/GuiZonePlan.java b/common/buildcraft/robotics/gui/GuiZonePlan.java index 2469b604..1f662741 100755 --- a/common/buildcraft/robotics/gui/GuiZonePlan.java +++ b/common/buildcraft/robotics/gui/GuiZonePlan.java @@ -39,8 +39,7 @@ import buildcraft.robotics.TileZonePlan; public class GuiZonePlan extends GuiAdvancedInterface { - private static final ResourceLocation TMP_TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_GUI + "/map_gui.png"); + private static final ResourceLocation TMP_TEXTURE = new ResourceLocation("buildcraftrobotics:textures/gui/zone_planner_gui.png"); private int mapWidth = 200; private int mapHeight = 100; diff --git a/common/buildcraft/robotics/render/RenderRobot.java b/common/buildcraft/robotics/render/RenderRobot.java index 9660c42e..99d0be24 100644 --- a/common/buildcraft/robotics/render/RenderRobot.java +++ b/common/buildcraft/robotics/render/RenderRobot.java @@ -36,8 +36,8 @@ import buildcraft.robotics.ItemRobot; public class RenderRobot extends Render implements IItemRenderer { - private static final ResourceLocation overlay = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_overlay.png"); + private static final ResourceLocation overlay = new ResourceLocation( + DefaultProps.TEXTURE_PATH_ROBOTS + "/robot_overlay.png"); private final EntityItem dummyEntityItem = new EntityItem(null); private final RenderItem customRenderItem; diff --git a/common/buildcraft/robotics/statements/ActionRobotFilter.java b/common/buildcraft/robotics/statements/ActionRobotFilter.java index 2c5b459d..88b7c83d 100755 --- a/common/buildcraft/robotics/statements/ActionRobotFilter.java +++ b/common/buildcraft/robotics/statements/ActionRobotFilter.java @@ -49,7 +49,7 @@ public class ActionRobotFilter extends BCStatement implements IActionInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_robot_filter"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_robot_filter"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionRobotFilterTool.java b/common/buildcraft/robotics/statements/ActionRobotFilterTool.java index c7286a6a..ced83a4f 100644 --- a/common/buildcraft/robotics/statements/ActionRobotFilterTool.java +++ b/common/buildcraft/robotics/statements/ActionRobotFilterTool.java @@ -41,7 +41,7 @@ public class ActionRobotFilterTool extends BCStatement implements IActionInterna @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_robot_filter_tool"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_robot_filter_tool"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionRobotGotoStation.java b/common/buildcraft/robotics/statements/ActionRobotGotoStation.java index 8913e55d..53da56e4 100644 --- a/common/buildcraft/robotics/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robotics/statements/ActionRobotGotoStation.java @@ -43,7 +43,7 @@ public class ActionRobotGotoStation extends BCStatement implements IActionIntern @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_robot_goto_station"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_robot_goto_station"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionRobotWakeUp.java b/common/buildcraft/robotics/statements/ActionRobotWakeUp.java index c96b822e..b0fe0223 100755 --- a/common/buildcraft/robotics/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/robotics/statements/ActionRobotWakeUp.java @@ -29,7 +29,7 @@ public class ActionRobotWakeUp extends BCStatement implements IActionInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_robot_wakeup"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_robot_wakeup"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java b/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java index 5ab984c3..e2b6a436 100755 --- a/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java @@ -34,7 +34,7 @@ public class ActionRobotWorkInArea extends BCStatement implements IActionInterna @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_robot_in_area"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_robot_in_area"); } public static IZone getArea(StatementSlot slot) { diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java b/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java index 73a457e7..9d00410b 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java @@ -30,7 +30,7 @@ public class ActionStationAcceptFluids extends BCStatement implements IActionInt @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_accept_fluids"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_accept_fluids"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java index 55f9da1f..66320347 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java @@ -38,7 +38,7 @@ public class ActionStationAcceptItemsInv extends ActionStationInputItems { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_accept_items"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_accept_items"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java index 37587082..81b151a9 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java @@ -33,7 +33,7 @@ public class ActionStationAcceptItemsPipe extends ActionStationInputItems { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_drop_in_pipe"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_drop_in_pipe"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionStationAllowCraft.java b/common/buildcraft/robotics/statements/ActionStationAllowCraft.java index 3756515e..81707997 100755 --- a/common/buildcraft/robotics/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/robotics/statements/ActionStationAllowCraft.java @@ -30,7 +30,7 @@ public class ActionStationAllowCraft extends BCStatement implements IActionInter @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_allow_craft"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_allow_craft"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionStationForbidRobot.java b/common/buildcraft/robotics/statements/ActionStationForbidRobot.java index e88c254d..4819f2c1 100755 --- a/common/buildcraft/robotics/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/robotics/statements/ActionStationForbidRobot.java @@ -24,19 +24,21 @@ import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; public class ActionStationForbidRobot extends BCStatement implements IActionInternal { + private final boolean invert; - public ActionStationForbidRobot() { - super("buildcraft:station.forbid_robot"); + public ActionStationForbidRobot(boolean invert) { + super("buildcraft:station." + (invert ? "force" : "forbid") + "_robot"); + this.invert = invert; } @Override public String getDescription() { - return StringUtils.localize("gate.action.station.forbid_robot"); + return StringUtils.localize("gate.action.station." + (invert ? "force" : "forbid") + "_robot"); } @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_robot_forbidden"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_robot_" + (invert ? "mandatory" : "forbidden")); } @Override @@ -57,7 +59,7 @@ public class ActionStationForbidRobot extends BCStatement implements IActionInte public static boolean isForbidden(DockingStation station, EntityRobotBase robot) { for (StatementSlot s : new ActionIterator(station.getPipe().pipe)) { if (s.statement instanceof ActionStationForbidRobot) { - if (ActionStationForbidRobot.isForbidden(s, robot)) { + if (((ActionStationForbidRobot) s.statement).invert ^ ActionStationForbidRobot.isForbidden(s, robot)) { return true; } } diff --git a/common/buildcraft/robotics/statements/ActionStationProvideFluids.java b/common/buildcraft/robotics/statements/ActionStationProvideFluids.java index d6bd0565..e34518c0 100755 --- a/common/buildcraft/robotics/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/robotics/statements/ActionStationProvideFluids.java @@ -30,7 +30,7 @@ public class ActionStationProvideFluids extends BCStatement implements IActionIn @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_provide_fluids"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_provide_fluids"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionStationProvideItems.java b/common/buildcraft/robotics/statements/ActionStationProvideItems.java index 0125d51e..27d2bd7a 100755 --- a/common/buildcraft/robotics/statements/ActionStationProvideItems.java +++ b/common/buildcraft/robotics/statements/ActionStationProvideItems.java @@ -30,7 +30,7 @@ public class ActionStationProvideItems extends BCStatement implements IActionInt @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_provide_items"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_provide_items"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionStationRequestItems.java b/common/buildcraft/robotics/statements/ActionStationRequestItems.java index 7c0c0d71..5f1f5199 100755 --- a/common/buildcraft/robotics/statements/ActionStationRequestItems.java +++ b/common/buildcraft/robotics/statements/ActionStationRequestItems.java @@ -38,7 +38,7 @@ public class ActionStationRequestItems extends ActionStationInputItems { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_request_items"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_request_items"); } @Override diff --git a/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java b/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java index 909759cd..e3ecc82a 100755 --- a/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java +++ b/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java @@ -29,7 +29,7 @@ public class ActionStationRequestItemsMachine extends BCStatement implements IAc @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_station_machine_request"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/action_station_machine_request"); } @Override diff --git a/common/buildcraft/robotics/statements/DockingStationIterator.java b/common/buildcraft/robotics/statements/DockingStationIterator.java new file mode 100644 index 00000000..878db9cf --- /dev/null +++ b/common/buildcraft/robotics/statements/DockingStationIterator.java @@ -0,0 +1,48 @@ +package buildcraft.robotics.statements; + +import java.util.Iterator; +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.transport.IPipeTile; +import buildcraft.robotics.DockingStation; +import buildcraft.robotics.RobotUtils; + +public class DockingStationIterator implements Iterator { + private final IPipeTile tile; + private DockingStation next; + private int side = -1; + + public DockingStationIterator(IStatementContainer container) { + tile = container.getTile() instanceof IPipeTile ? (IPipeTile) container.getTile() : null; + findNext(); + } + + private void findNext() { + while (side < 6) { + side++; + DockingStation station = RobotUtils.getStation(tile, ForgeDirection.getOrientation(side)); + + if (station != null) { + next = station; + return; + } + } + next = null; + } + + @Override + public boolean hasNext() { + return tile != null && next != null; + } + + @Override + public DockingStation next() { + if (hasNext()) { + DockingStation output = next; + findNext(); + return output; + } else { + return null; + } + } +} diff --git a/common/buildcraft/robotics/statements/RobotsActionProvider.java b/common/buildcraft/robotics/statements/RobotsActionProvider.java index a9916fcb..f3f9acd4 100755 --- a/common/buildcraft/robotics/statements/RobotsActionProvider.java +++ b/common/buildcraft/robotics/statements/RobotsActionProvider.java @@ -63,6 +63,7 @@ public class RobotsActionProvider implements IActionProvider { result.add(BuildCraftRobotics.actionRobotFilter); result.add(BuildCraftRobotics.actionRobotFilterTool); result.add(BuildCraftRobotics.actionStationForbidRobot); + result.add(BuildCraftRobotics.actionStationForceRobot); if (((TileGenericPipe) tile).pipe.transport instanceof PipeTransportItems) { result.add(BuildCraftRobotics.actionStationDropInPipe); diff --git a/common/buildcraft/robotics/statements/RobotsTriggerProvider.java b/common/buildcraft/robotics/statements/RobotsTriggerProvider.java index 7823e332..8ed60a44 100755 --- a/common/buildcraft/robotics/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/robotics/statements/RobotsTriggerProvider.java @@ -8,7 +8,6 @@ */ package buildcraft.robotics.statements; -import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; @@ -21,35 +20,20 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; -import buildcraft.api.transport.IPipeTile; -import buildcraft.robotics.DockingStation; -import buildcraft.robotics.RobotUtils; public class RobotsTriggerProvider implements ITriggerProvider { - @Override public Collection getInternalTriggers(IStatementContainer container) { LinkedList result = new LinkedList(); - TileEntity tile = container.getTile(); + DockingStationIterator iterator = new DockingStationIterator(container); - if (!(tile instanceof IPipeTile)) { - return result; + if (iterator.hasNext()) { + result.add(BuildCraftRobotics.triggerRobotSleep); + result.add(BuildCraftRobotics.triggerRobotInStation); + result.add(BuildCraftRobotics.triggerRobotLinked); + result.add(BuildCraftRobotics.triggerRobotReserved); } - ArrayList stations = new ArrayList(); - - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (RobotUtils.getStation((IPipeTile) tile, dir) != null) { - stations.add(RobotUtils.getStation((IPipeTile) tile, dir)); - } - } - - if (stations.size() == 0) { - return result; - } - - result.add(BuildCraftRobotics.triggerRobotSleep); - return result; } @@ -57,5 +41,4 @@ public class RobotsTriggerProvider implements ITriggerProvider { public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { return null; } - } diff --git a/common/buildcraft/robotics/statements/TriggerRobotInStation.java b/common/buildcraft/robotics/statements/TriggerRobotInStation.java new file mode 100755 index 00000000..bfe93d0d --- /dev/null +++ b/common/buildcraft/robotics/statements/TriggerRobotInStation.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.robotics.statements; + +import net.minecraft.client.renderer.texture.IIconRegister; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.ITriggerInternal; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; +import buildcraft.robotics.DockingStation; +import buildcraft.robotics.EntityRobot; +import buildcraft.robotics.ai.AIRobotSleep; + +public class TriggerRobotInStation extends BCStatement implements ITriggerInternal { + + public TriggerRobotInStation() { + super("buildcraft:robot.in.station"); + } + + @Override + public String getDescription() { + return StringUtils.localize("gate.trigger.robot.in.station"); + } + + @Override + public void registerIcons(IIconRegister iconRegister) { + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/trigger_robot_in_station"); + } + + @Override + public boolean isTriggerActive(IStatementContainer container, IStatementParameter[] parameters) { + DockingStationIterator iterator = new DockingStationIterator(container); + + while (iterator.hasNext()) { + DockingStation station = iterator.next(); + if (station.robotTaking() != null) { + EntityRobot robot = (EntityRobot) station.robotTaking(); + + if (robot.getDockingStation() == station) { + return true; + } + } + } + + return false; + } +} diff --git a/common/buildcraft/robotics/statements/TriggerRobotLinked.java b/common/buildcraft/robotics/statements/TriggerRobotLinked.java new file mode 100755 index 00000000..2c4a12ce --- /dev/null +++ b/common/buildcraft/robotics/statements/TriggerRobotLinked.java @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.robotics.statements; + +import net.minecraft.client.renderer.texture.IIconRegister; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.ITriggerInternal; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.statements.BCStatement; +import buildcraft.robotics.DockingStation; +import buildcraft.robotics.EntityRobot; + +public class TriggerRobotLinked extends BCStatement implements ITriggerInternal { + private final boolean reserved; + + public TriggerRobotLinked(boolean reserved) { + super("buildcraft:robot." + (reserved ? "reserved" : "linked")); + this.reserved = reserved; + } + + @Override + public String getDescription() { + return StringUtils.localize("gate.trigger.robot." + (reserved ? "reserved" : "linked")); + } + + @Override + public void registerIcons(IIconRegister iconRegister) { + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/trigger_robot_" + (reserved ? "reserved" : "linked")); + } + + @Override + public boolean isTriggerActive(IStatementContainer container, IStatementParameter[] parameters) { + DockingStationIterator iterator = new DockingStationIterator(container); + + while (iterator.hasNext()) { + DockingStation station = iterator.next(); + if (station.isTaken() && (reserved || station.isMainStation())) { + return true; + } + } + + return false; + } +} diff --git a/common/buildcraft/robotics/statements/TriggerRobotSleep.java b/common/buildcraft/robotics/statements/TriggerRobotSleep.java index df9e867d..2553e803 100755 --- a/common/buildcraft/robotics/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robotics/statements/TriggerRobotSleep.java @@ -36,21 +36,16 @@ public class TriggerRobotSleep extends BCStatement implements ITriggerInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/trigger_robot_sleep"); + icon = iconRegister.registerIcon("buildcraftrobotics:triggers/trigger_robot_sleep"); } @Override public boolean isTriggerActive(IStatementContainer container, IStatementParameter[] parameters) { - if (!(container.getTile() instanceof IPipeTile)) { - return false; - } - - IPipeTile tile = (IPipeTile) container.getTile(); + DockingStationIterator iterator = new DockingStationIterator(container); - for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { - DockingStation station = RobotUtils.getStation(tile, d); - - if (station != null && station.robotTaking() != null) { + while (iterator.hasNext()) { + DockingStation station = iterator.next(); + if (station.robotTaking() != null) { EntityRobot robot = (EntityRobot) station.robotTaking(); if (robot.mainAI.getActiveAI() instanceof AIRobotSleep) { diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 3f20db37..a8a38994 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -42,9 +42,6 @@ public class BlockLaser extends BlockBuildCraft implements ICustomHighlight { {AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 0.25, 1.0, 1.0), AxisAlignedBB.getBoundingBox(0.25, 0.3125, 0.3125, 0.8125, 0.6875, 0.6875)} // +X }; - @SideOnly(Side.CLIENT) - private IIcon textureTop, textureBottom, textureSide; - public BlockLaser() { super(Material.iron); setHardness(10F); @@ -110,25 +107,27 @@ public class BlockLaser extends BlockBuildCraft implements ICustomHighlight { return false; } - public boolean isACube() { - return false; - } - @Override public TileEntity createNewTileEntity(World world, int metadata) { return new TileLaser(); } @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) { + return getIcon(side, access.getBlockMetadata(x, y, z)); + } + + @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int i, int j) { if (i == (j ^ 1)) { - return textureBottom; + return icons[0][0]; } else if (i == j) { - return textureTop; + return icons[0][1]; } else { - return textureSide; + return icons[0][2]; } - } @Override @@ -144,14 +143,6 @@ public class BlockLaser extends BlockBuildCraft implements ICustomHighlight { return retMeta; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcon("buildcraft:laser_top"); - textureBottom = par1IconRegister.registerIcon("buildcraft:laser_bottom"); - textureSide = par1IconRegister.registerIcon("buildcraft:laser_side"); - } - @Override public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { return false; diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index 952806f6..c723b0ed 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -35,10 +35,6 @@ import buildcraft.core.lib.utils.Utils; public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBlock { protected static final int TABLE_MAX = 5; - private static final String[] ICON_NAMES = {"assemblytable", "advworkbenchtable", "integrationtable", "chargingtable", "programmingtable"}; - @SideOnly(Side.CLIENT) - private IIcon[][] icons; - public BlockLaserTable() { super(Material.iron); @@ -57,12 +53,12 @@ public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBloc return false; } - public boolean isACube() { - return false; - } - @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { + if (super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9)) { + return true; + } + // Drop through if the player is sneaking if (entityplayer.isSneaking()) { return false; @@ -81,22 +77,6 @@ public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBloc return true; } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) { - Utils.preDestroyBlock(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } - - @Override - public IIcon getIcon(int side, int meta) { - if (meta >= TABLE_MAX) { - return null; - } - - int s = side > 1 ? 2 : side; - return icons[meta][s]; - } - @Override public TileEntity createTileEntity(World world, int metadata) { switch (metadata) { @@ -135,13 +115,13 @@ public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBloc @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TABLE_MAX][]; - for (int i = 0; i < TABLE_MAX; i++) { - icons[i] = new IIcon[3]; - icons[i][0] = par1IconRegister.registerIcon("buildcraft:" + ICON_NAMES[i] + "_bottom"); - icons[i][1] = par1IconRegister.registerIcon("buildcraft:" + ICON_NAMES[i] + "_top"); - icons[i][2] = par1IconRegister.registerIcon("buildcraft:" + ICON_NAMES[i] + "_side"); - } + public String[] getIconBlockNames() { + return new String[] { + "BuildCraft|Silicon:assemblyTable", + "BuildCraft|Silicon:advancedCraftingTable", + "BuildCraft|Silicon:integrationTable", + "BuildCraft|Silicon:chargingTable", + "BuildCraft|Silicon:programmingTable" + }; } } diff --git a/common/buildcraft/silicon/ItemRedstoneChipset.java b/common/buildcraft/silicon/ItemRedstoneChipset.java index e581b293..f5c0ad22 100644 --- a/common/buildcraft/silicon/ItemRedstoneChipset.java +++ b/common/buildcraft/silicon/ItemRedstoneChipset.java @@ -88,7 +88,7 @@ public class ItemRedstoneChipset extends ItemBuildCraft { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { for (Chipset chipset : Chipset.VALUES) { - chipset.icon = par1IconRegister.registerIcon("buildcraft:" + chipset.getChipsetName()); + chipset.icon = par1IconRegister.registerIcon("buildcraftsilicon:chipset/" + chipset.getChipsetName()); } } diff --git a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java index 0a90f340..323e3287 100644 --- a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java @@ -18,7 +18,7 @@ import buildcraft.silicon.TileAdvancedCraftingTable; public class GuiAdvancedCraftingTable extends GuiLaserTable { - public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/assembly_advancedworkbench.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftsilicon:textures/gui/assembly_advancedworkbench.png"); private final TileAdvancedCraftingTable workbench; public GuiAdvancedCraftingTable(InventoryPlayer playerInventory, TileAdvancedCraftingTable advancedWorkbench) { diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 1e948671..2ca30836 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -30,7 +30,7 @@ import buildcraft.silicon.TileAssemblyTable; public class GuiAssemblyTable extends GuiAdvancedInterface { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftsilicon:textures/gui/assembly_table.png"); private class LaserTableLedger extends Ledger { diff --git a/common/buildcraft/silicon/gui/GuiChargingTable.java b/common/buildcraft/silicon/gui/GuiChargingTable.java index 299521ee..cfbe45af 100644 --- a/common/buildcraft/silicon/gui/GuiChargingTable.java +++ b/common/buildcraft/silicon/gui/GuiChargingTable.java @@ -16,7 +16,7 @@ import buildcraft.silicon.TileChargingTable; public class GuiChargingTable extends GuiLaserTable { - public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/charging_table.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftsilicon:textures/gui/charging_table.png"); private final TileChargingTable table; public GuiChargingTable(InventoryPlayer playerInventory, TileChargingTable chargingTable) { diff --git a/common/buildcraft/silicon/gui/GuiIntegrationTable.java b/common/buildcraft/silicon/gui/GuiIntegrationTable.java index 45ef859d..caf4e44c 100644 --- a/common/buildcraft/silicon/gui/GuiIntegrationTable.java +++ b/common/buildcraft/silicon/gui/GuiIntegrationTable.java @@ -18,7 +18,7 @@ import buildcraft.silicon.TileIntegrationTable; public class GuiIntegrationTable extends GuiLaserTable { - public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/integration_table.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftsilicon:textures/gui/integration_table.png"); private static final int FLASH_DELAY = 3; private final TileIntegrationTable integrationTable; private boolean flash; diff --git a/common/buildcraft/silicon/gui/GuiProgrammingTable.java b/common/buildcraft/silicon/gui/GuiProgrammingTable.java index a714d106..2596f9da 100644 --- a/common/buildcraft/silicon/gui/GuiProgrammingTable.java +++ b/common/buildcraft/silicon/gui/GuiProgrammingTable.java @@ -25,7 +25,7 @@ import buildcraft.silicon.TileProgrammingTable; public class GuiProgrammingTable extends GuiAdvancedInterface { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/programming_table.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftsilicon:textures/gui/programming_table.png"); private class LaserTableLedger extends Ledger { diff --git a/common/buildcraft/transport/BlockFilteredBuffer.java b/common/buildcraft/transport/BlockFilteredBuffer.java index 5434603d..7e49c9ef 100644 --- a/common/buildcraft/transport/BlockFilteredBuffer.java +++ b/common/buildcraft/transport/BlockFilteredBuffer.java @@ -26,9 +26,6 @@ import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; public class BlockFilteredBuffer extends BlockBuildCraft { - - private static IIcon blockTexture; - public BlockFilteredBuffer() { super(Material.iron); setHardness(5F); @@ -42,13 +39,8 @@ public class BlockFilteredBuffer extends BlockBuildCraft { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { - - super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9); - - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; + if (super.onBlockActivated(world, x, y, z, entityplayer, par6, par7, par8, par9)) { + return true; } if (entityplayer.isSneaking()) { @@ -67,16 +59,4 @@ public class BlockFilteredBuffer extends BlockBuildCraft { return true; } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockTexture = par1IconRegister.registerIcon("buildcraft:filteredBuffer_all"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int j) { - return blockTexture; - } } diff --git a/common/buildcraft/transport/ItemGateCopier.java b/common/buildcraft/transport/ItemGateCopier.java index d669657e..c56fe6ab 100644 --- a/common/buildcraft/transport/ItemGateCopier.java +++ b/common/buildcraft/transport/ItemGateCopier.java @@ -22,9 +22,6 @@ import buildcraft.transport.gates.GateDefinition.GateMaterial; import buildcraft.transport.gates.GatePluggable; public class ItemGateCopier extends ItemBuildCraft { - - private IIcon[] icons; - public ItemGateCopier() { super(); setMaxStackSize(1); @@ -112,11 +109,8 @@ public class ItemGateCopier extends ItemBuildCraft { return true; } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - icons = new IIcon[]{register.registerIcon("buildcraft:gateCopierOff"), register.registerIcon("buildcraft:gateCopierOn")}; + + public String[] getIconNames() { + return new String[]{"gateCopier/empty", "gateCopier/full"}; } - } diff --git a/common/buildcraft/transport/ItemPipeWire.java b/common/buildcraft/transport/ItemPipeWire.java index e30c8328..ac7f2b09 100644 --- a/common/buildcraft/transport/ItemPipeWire.java +++ b/common/buildcraft/transport/ItemPipeWire.java @@ -59,7 +59,7 @@ public class ItemPipeWire extends ItemBuildCraft { public void registerIcons(IIconRegister par1IconRegister) { icons = new IIcon[PipeWire.VALUES.length]; for (PipeWire pipeWire : PipeWire.VALUES) { - icons[pipeWire.ordinal()] = par1IconRegister.registerIcon("buildcraft:" + pipeWire.getTag()); + icons[pipeWire.ordinal()] = par1IconRegister.registerIcon("buildcrafttransport:pipeWire/" + pipeWire.getColor().toLowerCase()); } } diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index 6c85b65b..533166ab 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -130,8 +130,8 @@ public class PipeIconProvider implements IIconProvider { PipeRobotStationReserved("pipeRobotStationReserved"), PipeRobotStationLinked("pipeRobotStationLinked"), // - Power_Normal("texture_cyan"), - Power_Overload("texture_red_lit"), + Power_Normal("core:misc/texture_cyan"), + Power_Overload("core:misc/texture_red_lit"), Stripes("pipeStripes"), // PipeStainedOverlay("pipeStainedOverlay"), @@ -140,7 +140,7 @@ public class PipeIconProvider implements IIconProvider { PipeLensOverlay("pipeLensOverlay"), // TransparentFacade("transparent_facade"), - Transparent("transparent"), + Transparent("core:misc/transparent"), // PipePowerAdapterTop("pipePowerAdapterTop"), PipePowerAdapterSide("pipePowerAdapterSide"), @@ -162,7 +162,11 @@ public class PipeIconProvider implements IIconProvider { } private void registerIcon(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:" + (BuildCraftCore.colorBlindMode ? iconTagColorBlind : iconTag)); + String name = BuildCraftCore.colorBlindMode ? iconTagColorBlind : iconTag; + if (name.indexOf(":") < 0) { + name = "transport:pipes/" + name; + } + icon = iconRegister.registerIcon("buildcraft" + name); } public IIcon getIcon() { diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 340c4a53..cd5faeca 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -59,6 +59,7 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { public int[] dbgEnergyInput = new int[6]; public int[] dbgEnergyOutput = new int[6]; + public int[] dbgEnergyOffered = new int[6]; private boolean needsInit = true; private TileEntity[] tiles = new TileEntity[6]; @@ -193,9 +194,6 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { System.arraycopy(displayPower, 0, prevDisplayPower, 0, 6); Arrays.fill(displayPower, (short) 0); - Arrays.fill(dbgEnergyInput, 0); - Arrays.fill(dbgEnergyOutput, 0); - for (int i = 0; i < 6; ++i) { if (internalPower[i] > 0) { int totalPowerQuery = 0; @@ -221,7 +219,6 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { ForgeDirection.VALID_DIRECTIONS[j].getOpposite(), watts); internalPower[i] -= watts; - dbgEnergyInput[i] += watts; dbgEnergyOutput[j] += watts; } else if (ep instanceof IEnergyHandler) { IEnergyHandler handler = (IEnergyHandler) ep; @@ -230,7 +227,6 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { watts, false); } internalPower[i] -= watts; - dbgEnergyInput[i] += watts; dbgEnergyOutput[j] += watts; } else if (ep instanceof IEnergyReceiver) { IEnergyReceiver handler = (IEnergyReceiver) ep; @@ -239,7 +235,6 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { watts, false); } internalPower[i] -= watts; - dbgEnergyInput[i] += watts; dbgEnergyOutput[j] += watts; } @@ -344,6 +339,10 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { && currentDate != container.getWorldObj().getTotalWorldTime()) { currentDate = container.getWorldObj().getTotalWorldTime(); + Arrays.fill(dbgEnergyInput, 0); + Arrays.fill(dbgEnergyOffered, 0); + Arrays.fill(dbgEnergyOutput, 0); + powerQuery = nextPowerQuery; nextPowerQuery = new int[6]; @@ -359,14 +358,18 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { * Power Pipes or a subclass thereof. */ public int receiveEnergy(ForgeDirection from, int val) { + int side = from.ordinal(); + step(); + + dbgEnergyOffered[side] += val; + if (this.container.pipe instanceof IPipeTransportPowerHook) { int ret = ((IPipeTransportPowerHook) this.container.pipe).receiveEnergy(from, val); if (ret >= 0) { return ret; } } - int side = from.ordinal(); if (internalNextPower[side] > maxPower) { return 0; } @@ -381,6 +384,8 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { } } + dbgEnergyInput[side] += val; + return val; } @@ -462,6 +467,7 @@ public class PipeTransportPower extends PipeTransport implements IDebuggable { info.add("- internalPower: " + Arrays.toString(internalPower) + " <- " + Arrays.toString(internalNextPower)); info.add("- powerQuery: " + Arrays.toString(powerQuery) + " <- " + Arrays.toString(nextPowerQuery)); info.add("- energy: IN " + Arrays.toString(dbgEnergyInput) + ", OUT " + Arrays.toString(dbgEnergyOutput)); + info.add("- energy: OFFERED " + Arrays.toString(dbgEnergyOffered)); int[] totalPowerQuery = new int[6]; for (int i = 0; i < 6; ++i) { diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 1309ba87..73a0d458 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -43,14 +43,14 @@ public class WireIconProvider implements IIconProvider { public void registerIcons(IIconRegister iconRegister) { icons = new IIcon[MAX]; - icons[WireIconProvider.Texture_Red_Dark] = iconRegister.registerIcon("buildcraft:texture_red_dark"); - icons[WireIconProvider.Texture_Red_Lit] = iconRegister.registerIcon("buildcraft:texture_red_lit"); - icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.registerIcon("buildcraft:texture_blue_dark"); - icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.registerIcon("buildcraft:texture_blue_lit"); - icons[WireIconProvider.Texture_Green_Dark] = iconRegister.registerIcon("buildcraft:texture_green_dark"); - icons[WireIconProvider.Texture_Green_Lit] = iconRegister.registerIcon("buildcraft:texture_green_lit"); - icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.registerIcon("buildcraft:texture_yellow_dark"); - icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.registerIcon("buildcraft:texture_yellow_lit"); + icons[WireIconProvider.Texture_Red_Dark] = iconRegister.registerIcon("buildcraftcore:misc/texture_red_dark"); + icons[WireIconProvider.Texture_Red_Lit] = iconRegister.registerIcon("buildcraftcore:misc/texture_red_lit"); + icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.registerIcon("buildcraftcore:misc/texture_blue_dark"); + icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.registerIcon("buildcraftcore:misc/texture_blue_lit"); + icons[WireIconProvider.Texture_Green_Dark] = iconRegister.registerIcon("buildcraftcore:misc/texture_green_dark"); + icons[WireIconProvider.Texture_Green_Lit] = iconRegister.registerIcon("buildcraftcore:misc/texture_green_lit"); + icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.registerIcon("buildcraftcore:misc/texture_yellow_dark"); + icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.registerIcon("buildcraftcore:misc/texture_yellow_lit"); } diff --git a/common/buildcraft/transport/gates/GateDefinition.java b/common/buildcraft/transport/gates/GateDefinition.java index d896f49b..9e1106fe 100644 --- a/common/buildcraft/transport/gates/GateDefinition.java +++ b/common/buildcraft/transport/gates/GateDefinition.java @@ -57,7 +57,7 @@ public final class GateDefinition { private GateMaterial(String guiFile, int guiHeight, int numSlots, int triggerParameterSlots, int actionParameterSlots, int maxWireColor) { - this.guiFile = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/" + guiFile); + this.guiFile = new ResourceLocation("buildcrafttransport:textures/gui/" + guiFile); this.guiHeight = guiHeight; this.numSlots = numSlots; this.numTriggerParameters = triggerParameterSlots; @@ -82,14 +82,14 @@ public final class GateDefinition { @SideOnly(Side.CLIENT) public void registerBlockIcon(IIconRegister iconRegister) { if (this != REDSTONE) { - iconBlock = iconRegister.registerIcon("buildcraft:gates/gate_material_" + getTag()); + iconBlock = iconRegister.registerIcon("buildcrafttransport:gates/gate_material_" + getTag()); } } @SideOnly(Side.CLIENT) public void registerItemIcon(IIconRegister iconRegister) { if (this != REDSTONE) { - iconItem = iconRegister.registerIcon("buildcraft:gates/gate_material_" + getTag()); + iconItem = iconRegister.registerIcon("buildcrafttransport:gates/gate_material_" + getTag()); } } @@ -144,15 +144,15 @@ public final class GateDefinition { @SideOnly(Side.CLIENT) public void registerBlockIcon(IIconRegister iconRegister) { - iconLit = iconRegister.registerIcon("buildcraft:gates/gate_" + getTag() + "_lit"); - iconDark = iconRegister.registerIcon("buildcraft:gates/gate_" + getTag() + "_dark"); + iconLit = iconRegister.registerIcon("buildcrafttransport:gates/gate_" + getTag() + "_lit"); + iconDark = iconRegister.registerIcon("buildcrafttransport:gates/gate_" + getTag() + "_dark"); - iconGate = iconRegister.registerIcon("buildcraft:gates/gate_" + getTag()); + iconGate = iconRegister.registerIcon("buildcrafttransport:gates/gate_" + getTag()); } @SideOnly(Side.CLIENT) public void registerItemIcon(IIconRegister iconRegister) { - iconItem = iconRegister.registerIcon("buildcraft:gates/gate_logic_" + getTag()); + iconItem = iconRegister.registerIcon("buildcrafttransport:gates/gate_logic_" + getTag()); } public static GateLogic fromOrdinal(int ordinal) { diff --git a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java index e2e8e8a8..76dab4c6 100644 --- a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java +++ b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java @@ -36,12 +36,12 @@ public abstract class GateExpansionBuildcraft implements IGateExpansion { @Override public void registerBlockOverlay(IIconRegister iconRegister) { - iconBlock = iconRegister.registerIcon("buildcraft:gates/gate_expansion_" + tag); + iconBlock = iconRegister.registerIcon("buildcrafttransport:gates/gate_expansion_" + tag); } @Override public void registerItemOverlay(IIconRegister iconRegister) { - iconItem = iconRegister.registerIcon("buildcraft:gates/gate_expansion_" + tag); + iconItem = iconRegister.registerIcon("buildcrafttransport:gates/gate_expansion_" + tag); } @Override diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index 19707e76..37d0b565 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -27,9 +27,9 @@ public class GuiDiamondPipe extends GuiBuildCraft { static { if (!BuildCraftCore.colorBlindMode) { - TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filter.png"); + TEXTURE = new ResourceLocation("buildcrafttransport:textures/gui/filter.png"); } else { - TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filter_cb.png"); + TEXTURE = new ResourceLocation("buildcrafttransport:textures/gui/filter_cb.png"); } } diff --git a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java index 976545eb..de492d51 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java @@ -20,7 +20,7 @@ import buildcraft.transport.pipes.PipeFluidsEmerald; public class GuiEmeraldFluidPipe extends GuiBuildCraft { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/generic_one_slot.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcrafttransport:textures/gui/generic_one_slot.png"); IInventory playerInventory; IInventory filterInventory; diff --git a/common/buildcraft/transport/gui/GuiEmeraldPipe.java b/common/buildcraft/transport/gui/GuiEmeraldPipe.java index 59e90152..0d239eee 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldPipe.java @@ -25,7 +25,7 @@ import buildcraft.transport.pipes.PipeItemsEmerald.FilterMode; public class GuiEmeraldPipe extends GuiBuildCraft implements IButtonClickEventListener { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/pipe_emerald.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcrafttransport:textures/gui/pipe_emerald.png"); private static final int WHITE_LIST_BUTTON_ID = 1; private static final int BLACK_LIST_BUTTON_ID = 2; diff --git a/common/buildcraft/transport/gui/GuiEmzuliPipe.java b/common/buildcraft/transport/gui/GuiEmzuliPipe.java index 2b955d6d..bd6cb955 100644 --- a/common/buildcraft/transport/gui/GuiEmzuliPipe.java +++ b/common/buildcraft/transport/gui/GuiEmzuliPipe.java @@ -18,7 +18,7 @@ import buildcraft.transport.pipes.PipeItemsEmzuli; public class GuiEmzuliPipe extends GuiBuildCraft { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/pipe_emzuli.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcrafttransport:textures/gui/pipe_emzuli.png"); IInventory filterInventory; PipeItemsEmzuli pipe; diff --git a/common/buildcraft/transport/gui/GuiFilteredBuffer.java b/common/buildcraft/transport/gui/GuiFilteredBuffer.java index 8a91e2f8..990a4132 100644 --- a/common/buildcraft/transport/gui/GuiFilteredBuffer.java +++ b/common/buildcraft/transport/gui/GuiFilteredBuffer.java @@ -21,7 +21,7 @@ import buildcraft.transport.TileFilteredBuffer; public class GuiFilteredBuffer extends GuiContainer { - private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filteredBuffer_gui.png"); + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcrafttransport:textures/gui/filteredBuffer_gui.png"); IInventory playerInventory; TileFilteredBuffer filteredBuffer; diff --git a/common/buildcraft/transport/pluggable/ItemLens.java b/common/buildcraft/transport/pluggable/ItemLens.java index 7c834cc5..bf64f945 100755 --- a/common/buildcraft/transport/pluggable/ItemLens.java +++ b/common/buildcraft/transport/pluggable/ItemLens.java @@ -32,9 +32,6 @@ import buildcraft.core.lib.utils.ColorUtils; import buildcraft.core.lib.utils.StringUtils; public class ItemLens extends ItemBuildCraft implements IPipePluggableItem { - - private IIcon[] icons; - public ItemLens() { super(); setHasSubtypes(true); @@ -73,15 +70,11 @@ public class ItemLens extends ItemBuildCraft implements IPipePluggableItem { } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - icons = new IIcon[] { - register.registerIcon("buildcraft:pipeLensItem0"), - register.registerIcon("buildcraft:pipeLensItem1"), - register.registerIcon("buildcraft:pipeFilterItem0") - }; + public String[] getIconNames() { + return new String[] {"lens/lensFrame", "lens/transparent", "lens/filterFrame"}; } + @SuppressWarnings({"rawtypes", "unchecked"}) @Override @SideOnly(Side.CLIENT) diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java index aee3db70..fdd5f4c9 100644 --- a/common/buildcraft/transport/render/PipeRendererTESR.java +++ b/common/buildcraft/transport/render/PipeRendererTESR.java @@ -61,8 +61,6 @@ public class PipeRendererTESR extends TileEntitySpecialRenderer { public static final float DISPLAY_MULTIPLIER = 0.1f; public static final int POWER_STAGES = 100; - public static final ResourceLocation STRIPES_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_ENTITIES + "/stripes.png"); - private static final int LIQUID_STAGES = 40; private static final int MAX_ITEMS_TO_RENDER = 10; diff --git a/common/buildcraft/transport/statements/ActionEnergyPulsar.java b/common/buildcraft/transport/statements/ActionEnergyPulsar.java index b3691869..422bf0ed 100644 --- a/common/buildcraft/transport/statements/ActionEnergyPulsar.java +++ b/common/buildcraft/transport/statements/ActionEnergyPulsar.java @@ -29,7 +29,7 @@ public class ActionEnergyPulsar extends BCStatement implements IActionInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_pulsar"); + icon = iconRegister.registerIcon("buildcrafttransport:triggers/action_pulsar"); } @Override diff --git a/common/buildcraft/transport/statements/ActionExtractionPreset.java b/common/buildcraft/transport/statements/ActionExtractionPreset.java index 6c95a9c0..4215328f 100644 --- a/common/buildcraft/transport/statements/ActionExtractionPreset.java +++ b/common/buildcraft/transport/statements/ActionExtractionPreset.java @@ -36,7 +36,7 @@ public class ActionExtractionPreset extends BCStatement implements IActionIntern @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/extraction_preset_" + color.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcrafttransport:triggers/extraction_preset_" + color.name().toLowerCase(Locale.ENGLISH)); } @Override diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index 690c2dab..213018dc 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -101,10 +101,10 @@ public class ActionParameterSignal implements IStatementParameter { @Override public void registerIcons(IIconRegister iconRegister) { icons = new IIcon[] { - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_red_active"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_blue_active"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_green_active"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_active") + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_red_active"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_blue_active"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_green_active"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_yellow_active") }; } diff --git a/common/buildcraft/transport/statements/ActionPipeColor.java b/common/buildcraft/transport/statements/ActionPipeColor.java index 41fd86b4..85903882 100644 --- a/common/buildcraft/transport/statements/ActionPipeColor.java +++ b/common/buildcraft/transport/statements/ActionPipeColor.java @@ -36,7 +36,7 @@ public class ActionPipeColor extends BCStatement implements IActionInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/color_" + color.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcraftcore:triggers/color_" + color.name().toLowerCase(Locale.ENGLISH)); } @Override diff --git a/common/buildcraft/transport/statements/ActionPipeDirection.java b/common/buildcraft/transport/statements/ActionPipeDirection.java index af809b49..b73ecbf1 100644 --- a/common/buildcraft/transport/statements/ActionPipeDirection.java +++ b/common/buildcraft/transport/statements/ActionPipeDirection.java @@ -38,7 +38,7 @@ public class ActionPipeDirection extends BCStatement implements IActionInternal @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/trigger_dir_" + direction.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcraftcore:triggers/trigger_dir_" + direction.name().toLowerCase(Locale.ENGLISH)); } @Override diff --git a/common/buildcraft/transport/statements/ActionPowerLimiter.java b/common/buildcraft/transport/statements/ActionPowerLimiter.java index dc766212..2837f2d7 100644 --- a/common/buildcraft/transport/statements/ActionPowerLimiter.java +++ b/common/buildcraft/transport/statements/ActionPowerLimiter.java @@ -35,7 +35,7 @@ public class ActionPowerLimiter extends BCStatement implements IActionInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/trigger_limiter_" + limit.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcrafttransport:triggers/trigger_limiter_" + limit.name().toLowerCase(Locale.ENGLISH)); } @Override diff --git a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java index b1d09a2b..9b376b32 100644 --- a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java +++ b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java @@ -42,7 +42,7 @@ public class ActionRedstoneFaderOutput extends ActionRedstoneOutput implements I @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon(String.format("buildcraft:triggers/redstone_%02d", level)); + icon = iconRegister.registerIcon(String.format("buildcrafttransport:triggers/redstone_%02d", level)); } @Override diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index d8dcd6b6..675634cf 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -64,6 +64,6 @@ public class ActionSignalOutput extends BCStatement implements IActionInternal { @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_pipesignal_" + color.name().toLowerCase() + "_active"); + icon = register.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_" + color.name().toLowerCase() + "_active"); } } diff --git a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java index 86321917..7af768ae 100644 --- a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java +++ b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java @@ -29,7 +29,7 @@ public class ActionSingleEnergyPulse extends BCStatement implements IActionInter @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_single_pulsar"); + icon = iconRegister.registerIcon("buildcrafttransport:triggers/action_single_pulsar"); } @Override diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index d5a5e223..76c26318 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -58,7 +58,7 @@ public class ActionValve extends BCStatement implements IActionInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/action_valve_" + state.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcrafttransport:triggers/action_valve_" + state.name().toLowerCase(Locale.ENGLISH)); } @Override diff --git a/common/buildcraft/transport/statements/TriggerClockTimer.java b/common/buildcraft/transport/statements/TriggerClockTimer.java index 7a3c507b..d4482d3f 100644 --- a/common/buildcraft/transport/statements/TriggerClockTimer.java +++ b/common/buildcraft/transport/statements/TriggerClockTimer.java @@ -45,7 +45,7 @@ public class TriggerClockTimer extends BCStatement implements ITriggerInternal { @Override public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/trigger_timer_" + time.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcrafttransport:triggers/trigger_timer_" + time.name().toLowerCase(Locale.ENGLISH)); } @Override diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index 22b3c154..29aeb532 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -121,14 +121,14 @@ public class TriggerParameterSignal implements IStatementParameter { @Override public void registerIcons(IIconRegister iconRegister) { icons = new IIcon[]{ - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_red_inactive"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_blue_inactive"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_green_inactive"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_inactive"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_red_active"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_blue_active"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_green_active"), - iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_active") + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_red_inactive"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_blue_inactive"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_green_inactive"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_yellow_inactive"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_red_active"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_blue_active"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_green_active"), + iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_yellow_active") }; } diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index 9332af7f..e324ed07 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -161,6 +161,6 @@ public class TriggerPipeContents extends BCStatement implements ITriggerInternal @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_" + kind.name().toLowerCase(Locale.ENGLISH)); + icon = iconRegister.registerIcon("buildcrafttransport:triggers/trigger_pipecontents_" + kind.name().toLowerCase(Locale.ENGLISH)); } } diff --git a/common/buildcraft/transport/statements/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java index 831df9ab..24490ecb 100644 --- a/common/buildcraft/transport/statements/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -85,7 +85,7 @@ public class TriggerPipeSignal extends BCStatement implements ITriggerInternal { @Override public void registerIcons(IIconRegister register) { - icon = register.registerIcon("buildcraft:triggers/trigger_pipesignal_" + color.name().toLowerCase() + "_" + (active ? "active" : "inactive")); + icon = register.registerIcon("buildcrafttransport:triggers/trigger_pipesignal_" + color.name().toLowerCase() + "_" + (active ? "active" : "inactive")); } @Override diff --git a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java index 5731c2ae..aea9139a 100644 --- a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java @@ -57,7 +57,7 @@ public class TriggerRedstoneFaderInput extends BCStatement implements ITriggerIn @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - icon = iconRegister.registerIcon(String.format("buildcraft:triggers/redstone_%02d", level)); + icon = iconRegister.registerIcon(String.format("buildcrafttransport:triggers/redstone_%02d", level)); } @Override