From ac0c562b023e3be58e071efde98c0122e4f1b378 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 9 Apr 2014 14:22:36 -0500 Subject: [PATCH] Fixed Channel requirements for illuminated panels. --- parts/reporting/PartCraftingMonitor.java | 2 +- parts/reporting/PartDarkMonitor.java | 2 +- parts/reporting/PartMonitor.java | 5 +++-- parts/reporting/PartPatternTerminal.java | 2 +- parts/reporting/PartSemiDarkMonitor.java | 3 +-- parts/reporting/PartStorageMonitor.java | 4 ++-- parts/reporting/PartTerminal.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/parts/reporting/PartCraftingMonitor.java b/parts/reporting/PartCraftingMonitor.java index ef947769f..6158b8a81 100644 --- a/parts/reporting/PartCraftingMonitor.java +++ b/parts/reporting/PartCraftingMonitor.java @@ -7,7 +7,7 @@ public class PartCraftingMonitor extends PartMonitor { public PartCraftingMonitor(ItemStack is) { - super( PartCraftingMonitor.class, is ); + super( PartCraftingMonitor.class, is,true ); frontBright = CableBusTextures.PartCraftingMonitor_Bright; frontColored = CableBusTextures.PartCraftingMonitor_Colored; frontDark = CableBusTextures.PartCraftingMonitor_Dark; diff --git a/parts/reporting/PartDarkMonitor.java b/parts/reporting/PartDarkMonitor.java index 475aad3eb..dfbb7b30c 100644 --- a/parts/reporting/PartDarkMonitor.java +++ b/parts/reporting/PartDarkMonitor.java @@ -13,7 +13,7 @@ public class PartDarkMonitor extends PartMonitor { public PartDarkMonitor(ItemStack is) { - super( PartDarkMonitor.class, is ); + super( PartDarkMonitor.class, is,false ); notLightSource = false; } diff --git a/parts/reporting/PartMonitor.java b/parts/reporting/PartMonitor.java index 4e09269c4..abbeff5e3 100644 --- a/parts/reporting/PartMonitor.java +++ b/parts/reporting/PartMonitor.java @@ -114,9 +114,10 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann super( PartMonitor.class, is ); } - protected PartMonitor(Class c, ItemStack is) { + protected PartMonitor(Class c, ItemStack is, boolean requireChannel ) { super( c, is ); - if ( notLightSource ) + + if ( requireChannel ) proxy.setFlags( GridFlags.REQUIRE_CHANNEL ); else proxy.setIdlePowerUsage( 1.0 / 16.0 ); // lights drain a little bit. diff --git a/parts/reporting/PartPatternTerminal.java b/parts/reporting/PartPatternTerminal.java index 537494c53..21400877a 100644 --- a/parts/reporting/PartPatternTerminal.java +++ b/parts/reporting/PartPatternTerminal.java @@ -7,7 +7,7 @@ public class PartPatternTerminal extends PartMonitor { public PartPatternTerminal(ItemStack is) { - super( PartPatternTerminal.class, is ); + super( PartPatternTerminal.class, is, true ); frontBright = CableBusTextures.PartPatternTerm_Bright; frontColored = CableBusTextures.PartPatternTerm_Colored; frontDark = CableBusTextures.PartPatternTerm_Dark; diff --git a/parts/reporting/PartSemiDarkMonitor.java b/parts/reporting/PartSemiDarkMonitor.java index 8fb2f1266..0e9c898f3 100644 --- a/parts/reporting/PartSemiDarkMonitor.java +++ b/parts/reporting/PartSemiDarkMonitor.java @@ -13,8 +13,7 @@ public class PartSemiDarkMonitor extends PartMonitor { public PartSemiDarkMonitor(ItemStack is) { - super( PartSemiDarkMonitor.class, is ); - + super( PartSemiDarkMonitor.class, is,false ); notLightSource = false; } diff --git a/parts/reporting/PartStorageMonitor.java b/parts/reporting/PartStorageMonitor.java index d502fd57e..7d8899dc1 100644 --- a/parts/reporting/PartStorageMonitor.java +++ b/parts/reporting/PartStorageMonitor.java @@ -150,11 +150,11 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit } protected PartStorageMonitor(Class myClass, ItemStack is) { - super( myClass, is ); + super( myClass, is,true ); } public PartStorageMonitor(ItemStack is) { - super( PartStorageMonitor.class, is ); + super( PartStorageMonitor.class, is,true ); frontBright = CableBusTextures.PartStorageMonitor_Bright; frontColored = CableBusTextures.PartStorageMonitor_Colored; frontDark = CableBusTextures.PartStorageMonitor_Dark; diff --git a/parts/reporting/PartTerminal.java b/parts/reporting/PartTerminal.java index 5e0be23e3..11806c66a 100644 --- a/parts/reporting/PartTerminal.java +++ b/parts/reporting/PartTerminal.java @@ -30,7 +30,7 @@ public class PartTerminal extends PartMonitor implements ITerminalHost, IConfigM AppEngInternalInventory viewCell = new AppEngInternalInventory( this, 5 ); public PartTerminal(Class clz, ItemStack is) { - super( clz, is ); + super( clz, is,true ); cm.registerSetting( Settings.SORT_BY, SortOrder.NAME ); cm.registerSetting( Settings.VIEW_MODE, ViewItems.ALL ); @@ -54,7 +54,7 @@ public class PartTerminal extends PartMonitor implements ITerminalHost, IConfigM } public PartTerminal(ItemStack is) { - super( PartTerminal.class, is ); + super( PartTerminal.class, is,true ); frontBright = CableBusTextures.PartTerminal_Bright; frontColored = CableBusTextures.PartTerminal_Colored; frontDark = CableBusTextures.PartTerminal_Dark;