Allow colour applicator to remove colour from glass/terracotta (#7392)

Partly addresses #7366.
AppliedEnergistics · Sep 17, 2023 · 2bc05c6 · 2bc05c6
1 parent 0dccd8b
commit 2bc05c6
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
@@ -167,34 +167,34 @@ public InteractionResult useOn(UseOnContext context) {
                 return InteractionResult.FAIL;
             }
 
-            if (!paintBall.isEmpty() && paintBall.getItem() instanceof SnowballItem) {
-                var be = level.getBlockEntity(pos);
-                // clean cables.
-                if (p != null
-                        && be instanceof IColorableBlockEntity colorableBlockEntity
-                        && this.getAECurrentPower(is) > POWER_PER_USE
-                        && colorableBlockEntity.getColor() != AEColor.TRANSPARENT) {
-                    if (colorableBlockEntity.recolourBlock(side, AEColor.TRANSPARENT, p)) {
+            if (!paintBall.isEmpty()) {
+                if (paintBall.getItem() instanceof SnowballItem) {
+                    // clean cables.
+                    if (p != null
+                            && level.getBlockEntity(pos) instanceof IColorableBlockEntity colorableBlockEntity
+                            && this.getAECurrentPower(is) > POWER_PER_USE
+                            && colorableBlockEntity.getColor() != AEColor.TRANSPARENT) {
+                        if (colorableBlockEntity.recolourBlock(side, AEColor.TRANSPARENT, p)) {
+                            consumeItem(is, paintBallKey, false);
+                            return InteractionResult.sidedSuccess(level.isClientSide());
+                        }
+                    }
+
+                    // clean paint balls..
+                    final Block testBlk = level.getBlockState(pos.relative(side)).getBlock();
+                    final BlockEntity painted = level.getBlockEntity(pos.relative(side));
+                    if (this.getAECurrentPower(is) > POWER_PER_USE && testBlk instanceof PaintSplotchesBlock
+                            && painted instanceof PaintSplotchesBlockEntity) {
                         consumeItem(is, paintBallKey, false);
+                        ((PaintSplotchesBlockEntity) painted).cleanSide(side.getOpposite());
                         return InteractionResult.sidedSuccess(level.isClientSide());
                     }
                 }
 
-                // clean paint balls..
-                final Block testBlk = level.getBlockState(pos.relative(side)).getBlock();
-                final BlockEntity painted = level.getBlockEntity(pos.relative(side));
-                if (this.getAECurrentPower(is) > POWER_PER_USE && testBlk instanceof PaintSplotchesBlock
-                        && painted instanceof PaintSplotchesBlockEntity) {
-                    consumeItem(is, paintBallKey, false);
-                    ((PaintSplotchesBlockEntity) painted).cleanSide(side.getOpposite());
-                    return InteractionResult.sidedSuccess(level.isClientSide());
-                }
-            } else if (!paintBall.isEmpty()) {
                 final AEColor color = this.getColorFromItem(paintBall);
 
                 if (color != null
                         && this.getAECurrentPower(is) > POWER_PER_USE
-                        && color != AEColor.TRANSPARENT
                         && this.recolourBlock(blk, side, level, pos, color, p)) {
                     consumeItem(is, paintBallKey, false);
                     return InteractionResult.sidedSuccess(level.isClientSide());