From 5705eb7ed7cc016650882712eac3038e0a939836 Mon Sep 17 00:00:00 2001 From: Krapht Date: Tue, 16 Apr 2013 07:57:39 +0200 Subject: [PATCH] Fixed pipe Icons not being properly refreshed when switching texture packs. Closes #740 --- common/buildcraft/transport/GateIconProvider.java | 4 ---- common/buildcraft/transport/PipeIconProvider.java | 4 ---- common/buildcraft/transport/WireIconProvider.java | 5 ----- 3 files changed, 13 deletions(-) diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index 0e62c9aa..c3e72580 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -43,8 +43,6 @@ public class GateIconProvider implements IIconProvider { @SideOnly(Side.CLIENT) private Icon[] icons; - private boolean registered = false; - @Override @SideOnly(Side.CLIENT) public Icon getIcon(int pipeIconIndex) { @@ -54,8 +52,6 @@ public class GateIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - if (registered) return; - registered = true; icons = new Icon[MAX]; icons[GateIconProvider.Gate_Dark] = iconRegister.registerIcon("buildcraft:gate_dark"); diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index a0ad7945..f49e9378 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -47,8 +47,6 @@ public class PipeIconProvider implements IIconProvider { public static final int MAX = 34; - private boolean registered = false; - @SideOnly(Side.CLIENT) private Icon[] _icons; @@ -61,8 +59,6 @@ public class PipeIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - if (registered) return; - registered = true; _icons = new Icon[PipeIconProvider.MAX]; diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index f9e6dbe6..a7d5c7c4 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -22,8 +22,6 @@ public class WireIconProvider implements IIconProvider { @SideOnly(Side.CLIENT) private Icon[] icons; - private boolean registered = false; - @Override @SideOnly(Side.CLIENT) public Icon getIcon(int pipeIconIndex) { @@ -33,9 +31,6 @@ public class WireIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - if (registered) return; - registered = true; - icons = new Icon[MAX]; icons[WireIconProvider.Texture_Red_Dark] = iconRegister.registerIcon("buildcraft:texture_red_dark");