diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 5f106b8d..289fca1a 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -145,10 +145,10 @@ public class BlockArchitect extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockTextureSides = par1IconRegister.registerIcons("buildcraft:architect_sides"); - blockTextureTopNeg = par1IconRegister.registerIcons("buildcraft:architect_top_neg"); - blockTextureTopPos = par1IconRegister.registerIcons("buildcraft:architect_top_pos"); - blockTextureTopArchitect = par1IconRegister.registerIcons("buildcraft:architect_top"); - blockTextureFront = par1IconRegister.registerIcons("buildcraft:architect_front"); + blockTextureSides = par1IconRegister.registerIcon("buildcraft:architect_sides"); + blockTextureTopNeg = par1IconRegister.registerIcon("buildcraft:architect_top_neg"); + blockTextureTopPos = par1IconRegister.registerIcon("buildcraft:architect_top_pos"); + blockTextureTopArchitect = par1IconRegister.registerIcon("buildcraft:architect_top"); + blockTextureFront = par1IconRegister.registerIcon("buildcraft:architect_front"); } } diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index a0f49cdb..cf0c4318 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -92,7 +92,7 @@ public class BlockBlueprintLibrary extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcons("buildcraft:library_topbottom"); - textureSide = par1IconRegister.registerIcons("buildcraft:library_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:library_topbottom"); + textureSide = par1IconRegister.registerIcon("buildcraft:library_side"); } } diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 07e79d51..4161befb 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -132,8 +132,8 @@ public class BlockBuilder extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockTextureTop = par1IconRegister.registerIcons("buildcraft:builder_top"); - blockTextureSide = par1IconRegister.registerIcons("buildcraft:builder_side"); - blockTextureFront = par1IconRegister.registerIcons("buildcraft:builder_front"); + blockTextureTop = par1IconRegister.registerIcon("buildcraft:builder_top"); + blockTextureSide = par1IconRegister.registerIcon("buildcraft:builder_side"); + blockTextureFront = par1IconRegister.registerIcon("buildcraft:builder_front"); } } diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 6ea21900..c0ee0daf 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -113,8 +113,8 @@ public class BlockFiller extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTopOn = par1IconRegister.registerIcons("buildcraft:blockFillerTopOn"); - textureTopOff = par1IconRegister.registerIcons("buildcraft:blockFillerTopOff"); - textureSides = par1IconRegister.registerIcons("buildcraft:blockFillerSides"); + textureTopOn = par1IconRegister.registerIcon("buildcraft:blockFillerTopOn"); + textureTopOff = par1IconRegister.registerIcon("buildcraft:blockFillerTopOff"); + textureSides = par1IconRegister.registerIcon("buildcraft:blockFillerSides"); } } diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index d1734dae..67af26e8 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -224,6 +224,6 @@ public class BlockMarker extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockMarker"); + par1IconRegister.registerIcon("buildcraft:blockMarker"); } } diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index 5c91010a..249afe33 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -62,7 +62,7 @@ public class BlockPathMarker extends BlockMarker { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockIcon = par1IconRegister.registerIcons("buildcraft:blockPathMarker"); - activeMarker = par1IconRegister.registerIcons("buildcraft:blockPathMarkerActive"); + blockIcon = par1IconRegister.registerIcon("buildcraft:blockPathMarker"); + activeMarker = par1IconRegister.registerIcon("buildcraft:blockPathMarkerActive"); } } diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 1f08204c..1f329a9c 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -16,12 +16,12 @@ public class BuilderProxyClient extends BuilderProxy { public void initializeTextures() { TextureMap terrainMap = Minecraft.getMinecraft().renderEngine.textureMapItems; - fillerFillAllTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/fillAll"); - fillerClearTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/clear"); - fillerWallsTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/walls"); - fillerStairsTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/stairs"); - fillerFlattenTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/flatten"); - fillerPyramidTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/pyramid"); + fillerFillAllTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/fillAll"); + fillerClearTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/clear"); + fillerWallsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/walls"); + fillerStairsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/stairs"); + fillerFlattenTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/flatten"); + fillerPyramidTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/pyramid"); } @Override public void registerClientHook() { diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index 419c4ecb..0822aba7 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -65,6 +65,6 @@ public abstract class ItemBptBase extends ItemBuildCraft { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:template_clean"); + par1IconRegister.registerIcon("buildcraft:template_clean"); } } diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java index 943cb5b2..b9e76c34 100644 --- a/common/buildcraft/builders/ItemBptBluePrint.java +++ b/common/buildcraft/builders/ItemBptBluePrint.java @@ -35,7 +35,7 @@ public class ItemBptBluePrint extends ItemBptBase { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - cleanBlueprint = par1IconRegister.registerIcons("buildcraft:blueprint_clean"); - usedBlueprint = par1IconRegister.registerIcons("buildcraft:blueprint_used"); + cleanBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_clean"); + usedBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_used"); } } diff --git a/common/buildcraft/builders/ItemBptTemplate.java b/common/buildcraft/builders/ItemBptTemplate.java index 56f958b1..97e93f5e 100644 --- a/common/buildcraft/builders/ItemBptTemplate.java +++ b/common/buildcraft/builders/ItemBptTemplate.java @@ -24,6 +24,6 @@ public class ItemBptTemplate extends ItemBptBase { public void updateIcons(IconRegister par1IconRegister) { super.updateIcons(par1IconRegister); - par1IconRegister.registerIcons("buildcraft:template_used"); + par1IconRegister.registerIcon("buildcraft:template_used"); } } diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index cfcf9757..02b19630 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -44,6 +44,6 @@ public class BlockSpring extends Block { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockIcon = par1IconRegister.registerIcons("water"); + blockIcon = par1IconRegister.registerIcon("water"); } } diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 60df225b..23c1497f 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -25,7 +25,7 @@ public class CoreIconProvider implements IIconProvider { public void registerIcons(IconRegister iconRegister) { _icons = new Icon[MAX]; - _icons[ENERGY] = iconRegister.registerIcons("buildcraft:icons/energy"); + _icons[ENERGY] = iconRegister.registerIcon("buildcraft:icons/energy"); } diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index 5bc04aaa..9a8fe405 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -39,6 +39,6 @@ public class ItemBuildCraft extends Item { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - this.iconIndex = par1IconRegister.registerIcons("buildcraft:" + iconName); + this.iconIndex = par1IconRegister.registerIcon("buildcraft:" + iconName); } } diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index 25e6ab8c..c6a39fcd 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -49,7 +49,7 @@ public class ItemRedstoneChipset extends ItemBuildCraft { icons = new Icon[chipsetNames.length]; int i = 0; for (String csName : chipsetNames) { - icons[i++] = par1IconRegister.registerIcons("buildcraft:"+csName+"_chipset"); + icons[i++] = par1IconRegister.registerIcon("buildcraft:"+csName+"_chipset"); } } } diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index ef75ee27..c6e14d0f 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -119,10 +119,10 @@ public class CoreProxyClient extends CoreProxy { RenderingRegistry.registerBlockHandler(new RenderingMarkers()); TextureMap blockTextureMap = Minecraft.getMinecraft().renderEngine.textureMapItems; - BuildCraftCore.redLaserTexture = blockTextureMap.registerIcons("buildcraft:blockRedLaser"); - BuildCraftCore.blueLaserTexture = blockTextureMap.registerIcons("buildcraft:blockBlueLaser"); - BuildCraftCore.stripesLaserTexture = blockTextureMap.registerIcons("buildcraft:blockStripesLaser"); - BuildCraftCore.transparentTexture = blockTextureMap.registerIcons("buildcraft:blockTransparentLaser"); + BuildCraftCore.redLaserTexture = blockTextureMap.registerIcon("buildcraft:blockRedLaser"); + BuildCraftCore.blueLaserTexture = blockTextureMap.registerIcon("buildcraft:blockBlueLaser"); + BuildCraftCore.stripesLaserTexture = blockTextureMap.registerIcon("buildcraft:blockStripesLaser"); + BuildCraftCore.transparentTexture = blockTextureMap.registerIcon("buildcraft:blockTransparentLaser"); } @Override diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index 1624d479..6a01d88c 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -62,38 +62,38 @@ public class ActionTriggerIconProvider implements IIconProvider { registered = true; icons = new Icon[MAX]; - icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_on"); - icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_off"); - icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_loop"); + icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_on"); + icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_off"); + icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_loop"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_blue"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_green"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_yellow"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Red] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_red"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_empty"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Contains] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_contains"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Space] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_space"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Full] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_full"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_empty"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Contains] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_contains"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Space] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_space"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Full] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_full"); - icons[ActionTriggerIconProvider.Trigger_Machine_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_machine_active"); - icons[ActionTriggerIconProvider.Trigger_Machine_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_machine_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_empty"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsitems"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsliquid"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsenergy"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_red_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_red_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_blue_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_blue_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_green_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_green_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_yellow_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); - icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_redstoneinput_active"); - icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_redstoneinput_inactive"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_blue"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_green"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_yellow"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Red] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_red"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Empty] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_empty"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Contains] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_contains"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Space] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_space"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Full] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_full"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Empty] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_empty"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Contains] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_contains"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Space] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_space"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Full] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_full"); + icons[ActionTriggerIconProvider.Trigger_Machine_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_machine_active"); + icons[ActionTriggerIconProvider.Trigger_Machine_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_machine_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_Empty] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_empty"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_containsitems"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_containsliquid"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_containsenergy"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_red_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_red_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_blue_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_blue_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_green_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_green_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_redstoneinput_active"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_redstoneinput_inactive"); } diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index 4e8d4be0..e579e7bd 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -45,6 +45,6 @@ public class BlockPollution extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockPollution"); + par1IconRegister.registerIcon("buildcraft:blockPollution"); } } diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java index cd215955..734d20f4 100644 --- a/common/buildcraft/energy/ItemBucketOil.java +++ b/common/buildcraft/energy/ItemBucketOil.java @@ -35,6 +35,6 @@ public class ItemBucketOil extends ItemBucket { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:oil_bucket"); + par1IconRegister.registerIcon("buildcraft:oil_bucket"); } } diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index f5825f23..89c61258 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -79,7 +79,7 @@ public class BlockAutoWorkbench extends BlockBuildCraft { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - topTexture = par1IconRegister.registerIcons("buildcraft:autoWorkbench_top"); - sideTexture = par1IconRegister.registerIcons("buildcraft:autoWorkbench_side"); + topTexture = par1IconRegister.registerIcon("buildcraft:autoWorkbench_top"); + sideTexture = par1IconRegister.registerIcon("buildcraft:autoWorkbench_side"); } } diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 37d5f27d..f3c59261 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -198,6 +198,6 @@ public class BlockFrame extends Block implements IFramePipeConnection { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockFrame"); + par1IconRegister.registerIcon("buildcraft:blockFrame"); } } diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index cb3ddb1d..2ef00f97 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -91,9 +91,9 @@ public class BlockMiningWell extends BlockMachineRoot { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureFront = par1IconRegister.registerIcons("buildcraft:miningwell_front"); - textureSides = par1IconRegister.registerIcons("buildcraft:miningwell_side"); - textureBack = par1IconRegister.registerIcons("buildcraft:miningwell_back"); - textureTop = par1IconRegister.registerIcons("buildcraft:miningwell_top"); + 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 72cfd08c..92016cf9 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -77,6 +77,6 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockPlainPipe"); + par1IconRegister.registerIcon("buildcraft:blockPlainPipe"); } } diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index df41c381..fe195834 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -70,8 +70,8 @@ public class BlockPump extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcons("buildcraft:pump_top"); - textureBottom = par1IconRegister.registerIcons("buildcraft:pump_bottom"); - textureSide = par1IconRegister.registerIcons("buildcraft:pump_side"); + 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 494ed76d..6d71933e 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -227,8 +227,8 @@ public class BlockQuarry extends BlockMachineRoot { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureSide = par1IconRegister.registerIcons("buildcraft:quarry_side"); - textureTop = par1IconRegister.registerIcons("buildcraft:quarry_top"); - textureFront = par1IconRegister.registerIcons("buildcraft:quarry_front"); + textureSide = par1IconRegister.registerIcon("buildcraft:quarry_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:quarry_top"); + textureFront = par1IconRegister.registerIcon("buildcraft:quarry_front"); } } diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 21f26944..ec785650 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -139,9 +139,9 @@ public class BlockTank extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureStackedSide = par1IconRegister.registerIcons("buildcraft:tank_stacked_side"); - textureBottomSide = par1IconRegister.registerIcons("buildcraft:tank_bottom_side"); - textureTop = par1IconRegister.registerIcons("buildcraft:tank_top"); + textureStackedSide = par1IconRegister.registerIcon("buildcraft:tank_stacked_side"); + textureBottomSide = par1IconRegister.registerIcon("buildcraft:tank_bottom_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:tank_top"); } } diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index e87845ef..0597c045 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -43,9 +43,9 @@ public class FactoryProxyClient extends FactoryProxy { public void initializeEntityRenders() { RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid()); TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.textureMapItems; - pumpTexture = terrainTextures.registerIcons("buildcraft:blockPumpTubeTexture"); - drillTexture = terrainTextures.registerIcons("buildcraft:blockDrillTexture"); - drillHeadTexture = terrainTextures.registerIcons("buildcraft:blockDrillHeadTexture"); + pumpTexture = terrainTextures.registerIcon("buildcraft:blockPumpTubeTexture"); + drillTexture = terrainTextures.registerIcon("buildcraft:blockDrillTexture"); + drillHeadTexture = terrainTextures.registerIcon("buildcraft:blockDrillHeadTexture"); } @Override diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index 1098f80b..2abc72c4 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -101,11 +101,11 @@ public class BlockAssemblyTable extends BlockContainer { icons = new Icon[2][]; icons[0] = new Icon[3]; icons[1] = new Icon[3]; - icons[0][0] = par1IconRegister.registerIcons("buildcraft:assemblytable_bottom"); - icons[1][0] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_bottom"); - icons[0][1] = par1IconRegister.registerIcons("buildcraft:assemblytable_top"); - icons[1][1] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_top"); - icons[0][2] = par1IconRegister.registerIcons("buildcraft:assemblytable_side"); - icons[1][2] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_side"); + icons[0][0] = par1IconRegister.registerIcon("buildcraft:assemblytable_bottom"); + icons[1][0] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_bottom"); + icons[0][1] = par1IconRegister.registerIcon("buildcraft:assemblytable_top"); + icons[1][1] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_top"); + icons[0][2] = par1IconRegister.registerIcon("buildcraft:assemblytable_side"); + icons[1][2] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_side"); } } diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 7bd84f3f..60ab4379 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -92,8 +92,8 @@ public class BlockLaser extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcons("buildcraft:laser_top"); - textureBottom = par1IconRegister.registerIcons("buildcraft:laser_bottom"); - textureSide = par1IconRegister.registerIcons("buildcraft:laser_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:laser_top"); + textureBottom = par1IconRegister.registerIcon("buildcraft:laser_bottom"); + textureSide = par1IconRegister.registerIcon("buildcraft:laser_side"); } } diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index ea096a04..eec13b8d 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -58,35 +58,35 @@ public class GateIconProvider implements IIconProvider { registered = true; icons = new Icon[MAX]; - icons[GateIconProvider.Gate_Dark] = iconRegister.registerIcons("buildcraft:gate_dark"); - icons[GateIconProvider.Gate_Lit] = iconRegister.registerIcons("buildcraft:gate_lit"); - icons[GateIconProvider.Gate_Iron_And_Dark] = iconRegister.registerIcons("buildcraft:gate_iron_and_dark"); - icons[GateIconProvider.Gate_Iron_And_Lit] = iconRegister.registerIcons("buildcraft:gate_iron_and_lit"); - icons[GateIconProvider.Gate_Iron_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_iron_or_dark"); - icons[GateIconProvider.Gate_Iron_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_iron_or_lit"); - icons[GateIconProvider.Gate_Gold_And_Dark] = iconRegister.registerIcons("buildcraft:gate_gold_and_dark"); - icons[GateIconProvider.Gate_Gold_And_Lit] = iconRegister.registerIcons("buildcraft:gate_gold_and_lit"); - icons[GateIconProvider.Gate_Gold_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_gold_or_dark"); - icons[GateIconProvider.Gate_Gold_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_gold_or_lit"); - icons[GateIconProvider.Gate_Diamond_And_Dark] = iconRegister.registerIcons("buildcraft:gate_diamond_and_dark"); - icons[GateIconProvider.Gate_Diamond_And_Lit] = iconRegister.registerIcons("buildcraft:gate_diamond_and_lit"); - icons[GateIconProvider.Gate_Diamond_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_diamond_or_dark"); - icons[GateIconProvider.Gate_Diamond_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_diamond_or_lit"); + icons[GateIconProvider.Gate_Dark] = iconRegister.registerIcon("buildcraft:gate_dark"); + icons[GateIconProvider.Gate_Lit] = iconRegister.registerIcon("buildcraft:gate_lit"); + icons[GateIconProvider.Gate_Iron_And_Dark] = iconRegister.registerIcon("buildcraft:gate_iron_and_dark"); + icons[GateIconProvider.Gate_Iron_And_Lit] = iconRegister.registerIcon("buildcraft:gate_iron_and_lit"); + icons[GateIconProvider.Gate_Iron_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_iron_or_dark"); + icons[GateIconProvider.Gate_Iron_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_iron_or_lit"); + icons[GateIconProvider.Gate_Gold_And_Dark] = iconRegister.registerIcon("buildcraft:gate_gold_and_dark"); + icons[GateIconProvider.Gate_Gold_And_Lit] = iconRegister.registerIcon("buildcraft:gate_gold_and_lit"); + icons[GateIconProvider.Gate_Gold_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_gold_or_dark"); + icons[GateIconProvider.Gate_Gold_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_gold_or_lit"); + icons[GateIconProvider.Gate_Diamond_And_Dark] = iconRegister.registerIcon("buildcraft:gate_diamond_and_dark"); + icons[GateIconProvider.Gate_Diamond_And_Lit] = iconRegister.registerIcon("buildcraft:gate_diamond_and_lit"); + icons[GateIconProvider.Gate_Diamond_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_diamond_or_dark"); + icons[GateIconProvider.Gate_Diamond_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_diamond_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_dark"); - icons[GateIconProvider.Gate_Autarchic_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_lit"); - icons[GateIconProvider.Gate_Autarchic_Iron_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Iron_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Iron_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Iron_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Gold_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Gold_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Gold_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Gold_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Diamond_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Diamond_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_dark"); + icons[GateIconProvider.Gate_Autarchic_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_or_lit"); } } diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 59c7c594..65bca78f 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -127,21 +127,21 @@ public class ItemGate extends ItemBuildCraft { } icons = new Icon[ItemGate.MAX]; - icons[ItemGate.Gate] = iconRegister.registerIcons("buildcraft:gate"); - icons[ItemGate.Gate_Iron_And] = iconRegister.registerIcons("buildcraft:gate_iron_and"); - icons[ItemGate.Gate_Iron_Or] = iconRegister.registerIcons("buildcraft:gate_iron_or"); - icons[ItemGate.Gate_Gold_And] = iconRegister.registerIcons("buildcraft:gate_gold_and"); - icons[ItemGate.Gate_Gold_Or] = iconRegister.registerIcons("buildcraft:gate_gold_or"); - icons[ItemGate.Gate_Diamond_And] = iconRegister.registerIcons("buildcraft:gate_diamond_and"); - icons[ItemGate.Gate_Diamond_Or] = iconRegister.registerIcons("buildcraft:gate_diamond_or"); + icons[ItemGate.Gate] = iconRegister.registerIcon("buildcraft:gate"); + icons[ItemGate.Gate_Iron_And] = iconRegister.registerIcon("buildcraft:gate_iron_and"); + icons[ItemGate.Gate_Iron_Or] = iconRegister.registerIcon("buildcraft:gate_iron_or"); + icons[ItemGate.Gate_Gold_And] = iconRegister.registerIcon("buildcraft:gate_gold_and"); + icons[ItemGate.Gate_Gold_Or] = iconRegister.registerIcon("buildcraft:gate_gold_or"); + icons[ItemGate.Gate_Diamond_And] = iconRegister.registerIcon("buildcraft:gate_diamond_and"); + icons[ItemGate.Gate_Diamond_Or] = iconRegister.registerIcon("buildcraft:gate_diamond_or"); - icons[ItemGate.Autarchic_Gate] = iconRegister.registerIcons("buildcraft:autarchic_gate"); - icons[ItemGate.Autarchic_Gate_Iron_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_iron_and"); - icons[ItemGate.Autarchic_Gate_Iron_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_iron_or"); - icons[ItemGate.Autarchic_Gate_Gold_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_gold_and"); - icons[ItemGate.Autarchic_Gate_Gold_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_gold_or"); - icons[ItemGate.Autarchic_Gate_Diamond_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_diamond_and"); - icons[ItemGate.Autarchic_Gate_Diamond_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_diamond_or"); + icons[ItemGate.Autarchic_Gate] = iconRegister.registerIcon("buildcraft:autarchic_gate"); + icons[ItemGate.Autarchic_Gate_Iron_And] = iconRegister.registerIcon("buildcraft:autarchic_gate_iron_and"); + icons[ItemGate.Autarchic_Gate_Iron_Or] = iconRegister.registerIcon("buildcraft:autarchic_gate_iron_or"); + icons[ItemGate.Autarchic_Gate_Gold_And] = iconRegister.registerIcon("buildcraft:autarchic_gate_gold_and"); + icons[ItemGate.Autarchic_Gate_Gold_Or] = iconRegister.registerIcon("buildcraft:autarchic_gate_gold_or"); + icons[ItemGate.Autarchic_Gate_Diamond_And] = iconRegister.registerIcon("buildcraft:autarchic_gate_diamond_and"); + icons[ItemGate.Autarchic_Gate_Diamond_Or] = iconRegister.registerIcon("buildcraft:autarchic_gate_diamond_or"); } diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index 80fe43f4..f231d7b5 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -64,49 +64,49 @@ public class PipeIconProvider implements IIconProvider { _icons = new Icon[PipeIconProvider.MAX]; - _icons[PipeIconProvider.PipeStructureCobblestone] = iconRegister.registerIcons("buildcraft:pipeStructureCobblestone"); + _icons[PipeIconProvider.PipeStructureCobblestone] = iconRegister.registerIcon("buildcraft:pipeStructureCobblestone"); - _icons[PipeIconProvider.PipeItemsCobbleStone] = iconRegister.registerIcons("buildcraft:pipeItemsCobblestone"); + _icons[PipeIconProvider.PipeItemsCobbleStone] = iconRegister.registerIcon("buildcraft:pipeItemsCobblestone"); - _icons[PipeIconProvider.PipeItemsDiamond_Center] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_center"); - _icons[PipeIconProvider.PipeItemsDiamond_Down] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_down"); - _icons[PipeIconProvider.PipeItemsDiamond_Up] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_up"); - _icons[PipeIconProvider.PipeItemsDiamond_North] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_north"); - _icons[PipeIconProvider.PipeItemsDiamond_South] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_south"); - _icons[PipeIconProvider.PipeItemsDiamond_West] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_west"); - _icons[PipeIconProvider.PipeItemsDiamond_East] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_east"); + _icons[PipeIconProvider.PipeItemsDiamond_Center] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_center"); + _icons[PipeIconProvider.PipeItemsDiamond_Down] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_down"); + _icons[PipeIconProvider.PipeItemsDiamond_Up] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_up"); + _icons[PipeIconProvider.PipeItemsDiamond_North] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_north"); + _icons[PipeIconProvider.PipeItemsDiamond_South] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_south"); + _icons[PipeIconProvider.PipeItemsDiamond_West] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_west"); + _icons[PipeIconProvider.PipeItemsDiamond_East] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_east"); - _icons[PipeIconProvider.PipeItemsWood_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsWood_standard"); - _icons[PipeIconProvider.PipeAllWood_Solid] = iconRegister.registerIcons("buildcraft:pipeAllWood_solid"); + _icons[PipeIconProvider.PipeItemsWood_Standard] = iconRegister.registerIcon("buildcraft:pipeItemsWood_standard"); + _icons[PipeIconProvider.PipeAllWood_Solid] = iconRegister.registerIcon("buildcraft:pipeAllWood_solid"); - _icons[PipeIconProvider.PipeItemsEmerald_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsEmerald_standard"); - _icons[PipeIconProvider.PipeAllEmerald_Solid] = iconRegister.registerIcons("buildcraft:pipeAllEmerald_solid"); + _icons[PipeIconProvider.PipeItemsEmerald_Standard] = iconRegister.registerIcon("buildcraft:pipeItemsEmerald_standard"); + _icons[PipeIconProvider.PipeAllEmerald_Solid] = iconRegister.registerIcon("buildcraft:pipeAllEmerald_solid"); - _icons[PipeIconProvider.PipeItemsGold] = iconRegister.registerIcons("buildcraft:pipeItemsGold"); + _icons[PipeIconProvider.PipeItemsGold] = iconRegister.registerIcon("buildcraft:pipeItemsGold"); - _icons[PipeIconProvider.PipeItemsIron_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsIron_standard"); - _icons[PipeIconProvider.PipeAllIron_Solid] = iconRegister.registerIcons("buildcraft:pipeAllIron_solid"); + _icons[PipeIconProvider.PipeItemsIron_Standard] = iconRegister.registerIcon("buildcraft:pipeItemsIron_standard"); + _icons[PipeIconProvider.PipeAllIron_Solid] = iconRegister.registerIcon("buildcraft:pipeAllIron_solid"); - _icons[PipeIconProvider.PipeItemsObsidian] = iconRegister.registerIcons("buildcraft:pipeItemsObsidian"); - _icons[PipeIconProvider.PipeItemsSandstone] = iconRegister.registerIcons("buildcraft:pipeItemsSandstone"); - _icons[PipeIconProvider.PipeItemsStone] = iconRegister.registerIcons("buildcraft:pipeItemsStone"); - _icons[PipeIconProvider.PipeItemsVoid] = iconRegister.registerIcons("buildcraft:pipeItemsVoid"); + _icons[PipeIconProvider.PipeItemsObsidian] = iconRegister.registerIcon("buildcraft:pipeItemsObsidian"); + _icons[PipeIconProvider.PipeItemsSandstone] = iconRegister.registerIcon("buildcraft:pipeItemsSandstone"); + _icons[PipeIconProvider.PipeItemsStone] = iconRegister.registerIcon("buildcraft:pipeItemsStone"); + _icons[PipeIconProvider.PipeItemsVoid] = iconRegister.registerIcon("buildcraft:pipeItemsVoid"); - _icons[PipeIconProvider.PipeLiquidsCobblestone] = iconRegister.registerIcons("buildcraft:pipeLiquidsCobblestone"); - _icons[PipeIconProvider.PipeLiquidsWood_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsWood_standard"); - _icons[PipeIconProvider.PipeLiquidsEmerald_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsEmerald_standard"); - _icons[PipeIconProvider.PipeLiquidsGold] = iconRegister.registerIcons("buildcraft:pipeLiquidsGold"); - _icons[PipeIconProvider.PipeLiquidsIron_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsIron_standard"); - _icons[PipeIconProvider.PipeLiquidsSandstone] = iconRegister.registerIcons("buildcraft:pipeLiquidsSandstone"); - _icons[PipeIconProvider.PipeLiquidsStone] = iconRegister.registerIcons("buildcraft:pipeLiquidsStone"); - _icons[PipeIconProvider.PipeLiquidsVoid] = iconRegister.registerIcons("buildcraft:pipeLiquidsVoid"); + _icons[PipeIconProvider.PipeLiquidsCobblestone] = iconRegister.registerIcon("buildcraft:pipeLiquidsCobblestone"); + _icons[PipeIconProvider.PipeLiquidsWood_Standard] = iconRegister.registerIcon("buildcraft:pipeLiquidsWood_standard"); + _icons[PipeIconProvider.PipeLiquidsEmerald_Standard] = iconRegister.registerIcon("buildcraft:pipeLiquidsEmerald_standard"); + _icons[PipeIconProvider.PipeLiquidsGold] = iconRegister.registerIcon("buildcraft:pipeLiquidsGold"); + _icons[PipeIconProvider.PipeLiquidsIron_Standard] = iconRegister.registerIcon("buildcraft:pipeLiquidsIron_standard"); + _icons[PipeIconProvider.PipeLiquidsSandstone] = iconRegister.registerIcon("buildcraft:pipeLiquidsSandstone"); + _icons[PipeIconProvider.PipeLiquidsStone] = iconRegister.registerIcon("buildcraft:pipeLiquidsStone"); + _icons[PipeIconProvider.PipeLiquidsVoid] = iconRegister.registerIcon("buildcraft:pipeLiquidsVoid"); - _icons[PipeIconProvider.PipePowerGold] = iconRegister.registerIcons("buildcraft:pipePowerGold"); - _icons[PipeIconProvider.PipePowerStone] = iconRegister.registerIcons("buildcraft:pipePowerStone"); - _icons[PipeIconProvider.PipePowerWood_Standard] = iconRegister.registerIcons("buildcraft:pipePowerWood_standard"); + _icons[PipeIconProvider.PipePowerGold] = iconRegister.registerIcon("buildcraft:pipePowerGold"); + _icons[PipeIconProvider.PipePowerStone] = iconRegister.registerIcon("buildcraft:pipePowerStone"); + _icons[PipeIconProvider.PipePowerWood_Standard] = iconRegister.registerIcon("buildcraft:pipePowerWood_standard"); - _icons[PipeIconProvider.Power_Normal] = iconRegister.registerIcons("buildcraft:texture_cyan"); - _icons[PipeIconProvider.Power_Overload] = iconRegister.registerIcons("buildcraft:texture_red_dark"); + _icons[PipeIconProvider.Power_Normal] = iconRegister.registerIcon("buildcraft:texture_cyan"); + _icons[PipeIconProvider.Power_Overload] = iconRegister.registerIcon("buildcraft:texture_red_dark"); } } diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 10c5a8bc..010a04cb 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -38,14 +38,14 @@ public class WireIconProvider implements IIconProvider { icons = new Icon[MAX]; - icons[WireIconProvider.Texture_Red_Dark] = iconRegister.registerIcons("buildcraft:texture_red_dark"); - icons[WireIconProvider.Texture_Red_Lit] = iconRegister.registerIcons("buildcraft:texture_red_lit"); - icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.registerIcons("buildcraft:texture_blue_dark"); - icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.registerIcons("buildcraft:texture_blue_lit"); - icons[WireIconProvider.Texture_Green_Dark] = iconRegister.registerIcons("buildcraft:texture_green_dark"); - icons[WireIconProvider.Texture_Green_Lit] = iconRegister.registerIcons("buildcraft:texture_green_lit"); - icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.registerIcons("buildcraft:texture_yellow_dark"); - icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.registerIcons("buildcraft:texture_yellow_lit"); + 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"); }