mirror of
https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git
synced 2026-11-21 12:42:45 +00:00
Makes controller animations per storage network instead of globally (#1595)
This commit is contained in:
1 parent
579ab2bed1
commit
eee8fa38c6
17 files changed
+502
-59
No files matched your search
@@ -20,7 +20,7 @@ import appeng.block.networking.BlockController;
|
||||
import appeng.block.networking.BlockCreativeEnergyController;
|
||||
import appeng.client.render.BaseBlockRender;
|
||||
import appeng.client.texture.ExtraBlockTextures;
|
||||
import appeng.core.AEConfig;
|
||||
import appeng.core.settings.ControllerAnimation;
|
||||
import appeng.tile.networking.TileController;
|
||||
|
||||
public class RenderBlockController extends BaseBlockRender<BlockController, TileController> {
|
||||
@@ -138,9 +138,9 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
|
||||
final boolean out = renderer.renderStandardBlock(blk, x, y, z);
|
||||
|
||||
if (lights != null) {
|
||||
final IIcon lightIcon = isConflict || AEConfig.instance.controllerAnimation.usesOriginalTexture()
|
||||
? lights.getIcon()
|
||||
: blk.getLightTexture(textureId, controller.getColor());
|
||||
final ControllerAnimation animation = controller.getControllerAnimation();
|
||||
final IIcon lightIcon = isConflict || animation.usesOriginalTexture() ? lights.getIcon()
|
||||
: blk.getLightTexture(textureId, controller.getColor(), animation);
|
||||
final Tessellator tess = Tessellator.instance;
|
||||
tess.setColorOpaque_F(1.0f, 1.0f, 1.0f);
|
||||
tess.setBrightness(14 << 20 | 14 << 4);
|
||||
|
||||
Reference in new issue
Block a user