diff --git a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java b/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java index 9b3013afb..231e9ae1f 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java @@ -105,13 +105,13 @@ public class BlockAlveary extends BlockStructure { public static final int BOTTOM = 2; public static final int LEFT = 3; public static final int RIGHT = 4; - public static final int TX_55_SWOF = 5; - public static final int TX_56_SWON = 6; - public static final int TX_57_HTOF = 7; - public static final int TX_58_HTON = 8; - public static final int TX_71_FNOF = 9; - public static final int TX_72_FNON = 10; - public static final int TX_73_VLVE = 11; + public static final int ALVEARY_SWARMER_OFF = 5; + public static final int ALVEARY_SWARMER_ON = 6; + public static final int ALVEARY_HEATER_OFF = 7; + public static final int ALVEARY_HEATER_ON = 8; + public static final int ALVEARY_FAN_OFF = 9; + public static final int ALVEARY_FAN_ON = 10; + public static final int ALVEARY_HYGRO = 11; public static final int STABILISER = 12; public static final int SIEVE = 13; @@ -152,13 +152,13 @@ public class BlockAlveary extends BlockStructure { case 1: return icons[ENTRANCE]; case TileAlvearySwarmer.BLOCK_META: - return icons[TX_55_SWOF]; + return icons[ALVEARY_SWARMER_OFF]; case TileAlvearyFan.BLOCK_META: - return icons[TX_71_FNOF]; + return icons[ALVEARY_FAN_OFF]; case TileAlvearyHeater.BLOCK_META: - return icons[TX_57_HTOF]; + return icons[ALVEARY_HEATER_OFF]; case TileAlvearyHygroregulator.BLOCK_META: - return icons[TX_73_VLVE]; + return icons[ALVEARY_HYGRO]; case TileAlvearyStabiliser.BLOCK_META: return icons[STABILISER]; case TileAlvearySieve.BLOCK_META: diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyFan.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyFan.java index ed8e62bb1..5923c310a 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyFan.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyFan.java @@ -16,7 +16,7 @@ public class TileAlvearyFan extends TileAlvearyClimatiser { public static final int BLOCK_META = 3; public TileAlvearyFan() { - super(new ClimateControl(-0.01f, 0.05f, 2.5f), BlockAlveary.TX_71_FNOF, BlockAlveary.TX_72_FNON, BLOCK_META); + super(new ClimateControl(-0.01f, 0.05f, 2.5f), BlockAlveary.ALVEARY_FAN_OFF, BlockAlveary.ALVEARY_FAN_ON, BLOCK_META); } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHeater.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHeater.java index 47e1aae93..0e5d065a5 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHeater.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHeater.java @@ -12,14 +12,11 @@ package forestry.apiculture.gadgets; public class TileAlvearyHeater extends TileAlvearyClimatiser { - public static final int TEXTURE_OFF = 57; - public static final int TEXTURE_ON = 58; - /* CONSTANTS */ public static final int BLOCK_META = 4; public TileAlvearyHeater() { - super(new ClimateControl(0.01f, 0.0f, 2.5f), BlockAlveary.TX_57_HTOF, BlockAlveary.TX_58_HTON, BLOCK_META); + super(new ClimateControl(0.01f, 0.0f, 2.5f), BlockAlveary.ALVEARY_HEATER_OFF, BlockAlveary.ALVEARY_HEATER_ON, BLOCK_META); } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 64f6aa013..823693d88 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -187,7 +187,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory /* TEXTURES */ @Override public int getIcon(int side, int metadata) { - return BlockAlveary.TX_73_VLVE; + return BlockAlveary.ALVEARY_HYGRO; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index a7339d22f..a4f1983e6 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -158,9 +158,9 @@ public class TileAlvearySwarmer extends TileAlveary implements ISpecialInventory return BlockAlveary.BOTTOM; if (pendingSpawns.size() > 0) - return BlockAlveary.TX_56_SWON; + return BlockAlveary.ALVEARY_SWARMER_ON; else - return BlockAlveary.TX_55_SWOF; + return BlockAlveary.ALVEARY_SWARMER_OFF; } /* SAVING & LOADING */