Paint balls now color entities their color when they get hit for 30 or so seconds ( mostly works ).

Paint balls now color sheep.
The Color Applicator can now accept snow balls.
Snowballs can be used to clean paint balls, and to clean cables ( restore fluix )
Tweaks to Color API.
This commit is contained in:
AlgorithmX2
2014-07-20 22:45:08 -05:00
parent f355fc1643
commit 3f29590fad
22 changed files with 382 additions and 49 deletions
+1 -1
View File
@@ -779,7 +779,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
if ( c != newColor )
{
ct.setColor( newColor );
ct.recolourBlock( side, newColor, null );
return true;
}
return false;
+2 -1
View File
@@ -28,6 +28,7 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.parts.PartItemStack;
import appeng.api.parts.SelectedPart;
import appeng.api.util.AEColor;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderHelper;
@@ -224,7 +225,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
{
try
{
return cb( world, x, y, z ).recolourBlock( side, colour, who );
return cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who );
}
catch (Throwable t)
{